Changeset 148035 in webkit


Ignore:
Timestamp:
Apr 9, 2013 12:10:36 PM (11 years ago)
Author:
glenn@skynav.com
Message:

[webkitpy] Remove chromium deprecated port support.
https://bugs.webkit.org/show_bug.cgi?id=114228

Reviewed by Ryosuke Niwa.

  • Scripts/webkitpy/common/config/ports.py:

(DeprecatedPort.port): Removed chromium ports from port name to port class mapping.
(ChromiumPort): Removed.
(ChromiumAndroidPort): Removed.
(ChromiumXVFBPort): Removed.

  • Scripts/webkitpy/common/config/ports_unittest.py:

(DeprecatedPortTest.test_chromium_port): Removed.
(DeprecatedPortTest.test_chromium_android_port): Removed.
(DeprecatedPortTest.test_chromium_xvfb_port): Removed.

  • Scripts/webkitpy/tool/steps/update_unittest.py:

(UpdateTest.test_update_command_non_interactive): Use mac instead of chromium ports.
(UpdateTest.test_update_command_interactive): Use mac instead of chromium ports.

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r148033 r148035  
     12013-04-09  Glenn Adams  <glenn@skynav.com>
     2
     3        [webkitpy] Remove chromium deprecated port support.
     4        https://bugs.webkit.org/show_bug.cgi?id=114228
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * Scripts/webkitpy/common/config/ports.py:
     9        (DeprecatedPort.port): Removed chromium ports from port name to port class mapping.
     10        (ChromiumPort): Removed.
     11        (ChromiumAndroidPort): Removed.
     12        (ChromiumXVFBPort): Removed.
     13        * Scripts/webkitpy/common/config/ports_unittest.py:
     14        (DeprecatedPortTest.test_chromium_port): Removed.
     15        (DeprecatedPortTest.test_chromium_android_port): Removed.
     16        (DeprecatedPortTest.test_chromium_xvfb_port): Removed.
     17        * Scripts/webkitpy/tool/steps/update_unittest.py:
     18        (UpdateTest.test_update_command_non_interactive): Use mac instead of chromium ports.
     19        (UpdateTest.test_update_command_interactive): Use mac instead of chromium ports.
     20
    1212013-04-09  Chris Fleizach  <cfleizach@apple.com>
    222
  • trunk/Tools/Scripts/webkitpy/common/config/ports.py

    r146827 r148035  
    6262    def port(port_name):
    6363        ports = {
    64             "chromium": ChromiumPort,
    65             "chromium-android": ChromiumAndroidPort,
    66             "chromium-xvfb": ChromiumXVFBPort,
    6764            "gtk": GtkPort,
    6865            "mac": MacPort,
     
    178175        command.append(super(EflPort, self).makeArgs())
    179176        return command
    180 
    181 
    182 class ChromiumPort(DeprecatedPort):
    183     port_flag_name = "chromium"
    184 
    185     def update_webkit_command(self, non_interactive=False):
    186         command = super(ChromiumPort, self).update_webkit_command(non_interactive=non_interactive)
    187         command.append("--chromium")
    188         if non_interactive:
    189             command.append("--force-update")
    190         return command
    191 
    192     def build_webkit_command(self, build_style=None):
    193         command = super(ChromiumPort, self).build_webkit_command(build_style=build_style)
    194         command.append("--chromium")
    195         command.append("--update-chromium")
    196         return command
    197 
    198     def run_webkit_tests_command(self):
    199         # Note: This could be run-webkit-tests now.
    200         command = self.script_shell_command("new-run-webkit-tests")
    201         command.append("--chromium")
    202         command.append("--skip-failing-tests")
    203         return command
    204 
    205     def run_webkit_unit_tests_command(self):
    206         return self.script_shell_command("run-chromium-webkit-unit-tests")
    207 
    208     def run_javascriptcore_tests_command(self):
    209         return None
    210 
    211 
    212 class ChromiumAndroidPort(ChromiumPort):
    213     port_flag_name = "chromium-android"
    214 
    215     def update_webkit_command(self, non_interactive=False):
    216         command = super(ChromiumAndroidPort, self).update_webkit_command(non_interactive=non_interactive)
    217         command.append("--chromium-android")
    218         return command
    219 
    220     def build_webkit_command(self, build_style=None):
    221         command = super(ChromiumAndroidPort, self).build_webkit_command(build_style=build_style)
    222         command.append("--chromium-android")
    223         return command
    224 
    225 
    226 class ChromiumXVFBPort(ChromiumPort):
    227     port_flag_name = "chromium-xvfb"
    228 
    229     def run_webkit_tests_command(self):
    230         return ["xvfb-run"] + super(ChromiumXVFBPort, self).run_webkit_tests_command()
  • trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py

    r140510 r148035  
    5656        self.assertEqual(QtPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", DeprecatedPort().makeArgs()])
    5757        self.assertEqual(QtPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", DeprecatedPort().makeArgs()])
    58 
    59     def test_chromium_port(self):
    60         self.assertEqual(ChromiumPort().flag(), "--port=chromium")
    61         self.assertEqual(ChromiumPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("new-run-webkit-tests") + ["--chromium", "--skip-failing-tests"])
    62         self.assertEqual(ChromiumPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--chromium", "--update-chromium"])
    63         self.assertEqual(ChromiumPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--chromium", "--update-chromium"])
    64         self.assertEqual(ChromiumPort().update_webkit_command(), DeprecatedPort().script_shell_command("update-webkit") + ["--chromium"])
    65 
    66     def test_chromium_android_port(self):
    67         self.assertEqual(ChromiumAndroidPort().build_webkit_command(), ChromiumPort().build_webkit_command() + ["--chromium-android"])
    68         self.assertEqual(ChromiumAndroidPort().update_webkit_command(), ChromiumPort().update_webkit_command() + ["--chromium-android"])
    69 
    70     def test_chromium_xvfb_port(self):
    71         self.assertEqual(ChromiumXVFBPort().run_webkit_tests_command(), ['xvfb-run'] + DeprecatedPort().script_shell_command('new-run-webkit-tests') + ['--chromium', '--skip-failing-tests'])
  • trunk/Tools/Scripts/webkitpy/tool/steps/update_unittest.py

    r140510 r148035  
    2929import unittest2 as unittest
    3030
    31 from webkitpy.common.config.ports import ChromiumPort, ChromiumAndroidPort, ChromiumXVFBPort
     31from webkitpy.common.config.ports import MacPort, MacWK2Port
    3232from webkitpy.tool.mocktool import MockOptions, MockTool
    3333from webkitpy.tool.steps.update import Update
     
    4242        self.assertEqual(["mock-update-webkit"], step._update_command())
    4343
    44         tool._deprecated_port = ChromiumPort()
    45         self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command())
     44        tool._deprecated_port = MacPort()
     45        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())
    4646
    47         tool._deprecated_port = ChromiumXVFBPort()
    48         self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command())
    49 
    50         tool._deprecated_port = ChromiumAndroidPort()
    51         self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update", "--chromium-android"], step._update_command())
     47        tool._deprecated_port = MacWK2Port()
     48        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())
    5249
    5350    def test_update_command_interactive(self):
     
    5754        self.assertEqual(["mock-update-webkit"], step._update_command())
    5855
    59         tool._deprecated_port = ChromiumPort()
    60         self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command())
     56        tool._deprecated_port = MacPort()
     57        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())
    6158
    62         tool._deprecated_port = ChromiumXVFBPort()
    63         self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command())
    64 
    65         tool._deprecated_port = ChromiumAndroidPort()
    66         self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--chromium-android"], step._update_command())
     59        tool._deprecated_port = MacWK2Port()
     60        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())
Note: See TracChangeset for help on using the changeset viewer.