[webkitpy] Remove chromium deprecated port support.
authorglenn@skynav.com <glenn@skynav.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Apr 2013 19:10:36 +0000 (19:10 +0000)
committerglenn@skynav.com <glenn@skynav.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Apr 2013 19:10:36 +0000 (19:10 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/common/config/ports.py
Tools/Scripts/webkitpy/common/config/ports_unittest.py
Tools/Scripts/webkitpy/tool/steps/update_unittest.py

index 73a0c17..fbca557 100644 (file)
@@ -1,3 +1,23 @@
+2013-04-09  Glenn Adams  <glenn@skynav.com>
+
+        [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.
+
 2013-04-09  Chris Fleizach  <cfleizach@apple.com>
 
         AX: The bounding paths should be made available through accessibility
index 5c7bea0..b285d6b 100644 (file)
@@ -61,9 +61,6 @@ class DeprecatedPort(object):
     @staticmethod
     def port(port_name):
         ports = {
-            "chromium": ChromiumPort,
-            "chromium-android": ChromiumAndroidPort,
-            "chromium-xvfb": ChromiumXVFBPort,
             "gtk": GtkPort,
             "mac": MacPort,
             "mac-wk2": MacWK2Port,
@@ -177,54 +174,3 @@ class EflPort(DeprecatedPort):
         command.append("--update-efl")
         command.append(super(EflPort, self).makeArgs())
         return command
-
-
-class ChromiumPort(DeprecatedPort):
-    port_flag_name = "chromium"
-
-    def update_webkit_command(self, non_interactive=False):
-        command = super(ChromiumPort, self).update_webkit_command(non_interactive=non_interactive)
-        command.append("--chromium")
-        if non_interactive:
-            command.append("--force-update")
-        return command
-
-    def build_webkit_command(self, build_style=None):
-        command = super(ChromiumPort, self).build_webkit_command(build_style=build_style)
-        command.append("--chromium")
-        command.append("--update-chromium")
-        return command
-
-    def run_webkit_tests_command(self):
-        # Note: This could be run-webkit-tests now.
-        command = self.script_shell_command("new-run-webkit-tests")
-        command.append("--chromium")
-        command.append("--skip-failing-tests")
-        return command
-
-    def run_webkit_unit_tests_command(self):
-        return self.script_shell_command("run-chromium-webkit-unit-tests")
-
-    def run_javascriptcore_tests_command(self):
-        return None
-
-
-class ChromiumAndroidPort(ChromiumPort):
-    port_flag_name = "chromium-android"
-
-    def update_webkit_command(self, non_interactive=False):
-        command = super(ChromiumAndroidPort, self).update_webkit_command(non_interactive=non_interactive)
-        command.append("--chromium-android")
-        return command
-
-    def build_webkit_command(self, build_style=None):
-        command = super(ChromiumAndroidPort, self).build_webkit_command(build_style=build_style)
-        command.append("--chromium-android")
-        return command
-
-
-class ChromiumXVFBPort(ChromiumPort):
-    port_flag_name = "chromium-xvfb"
-
-    def run_webkit_tests_command(self):
-        return ["xvfb-run"] + super(ChromiumXVFBPort, self).run_webkit_tests_command()
index a434211..ef099b0 100644 (file)
@@ -55,17 +55,3 @@ class DeprecatedPortTest(unittest.TestCase):
         self.assertEqual(QtPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests"))
         self.assertEqual(QtPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", DeprecatedPort().makeArgs()])
         self.assertEqual(QtPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", DeprecatedPort().makeArgs()])
-
-    def test_chromium_port(self):
-        self.assertEqual(ChromiumPort().flag(), "--port=chromium")
-        self.assertEqual(ChromiumPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("new-run-webkit-tests") + ["--chromium", "--skip-failing-tests"])
-        self.assertEqual(ChromiumPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--chromium", "--update-chromium"])
-        self.assertEqual(ChromiumPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--chromium", "--update-chromium"])
-        self.assertEqual(ChromiumPort().update_webkit_command(), DeprecatedPort().script_shell_command("update-webkit") + ["--chromium"])
-
-    def test_chromium_android_port(self):
-        self.assertEqual(ChromiumAndroidPort().build_webkit_command(), ChromiumPort().build_webkit_command() + ["--chromium-android"])
-        self.assertEqual(ChromiumAndroidPort().update_webkit_command(), ChromiumPort().update_webkit_command() + ["--chromium-android"])
-
-    def test_chromium_xvfb_port(self):
-        self.assertEqual(ChromiumXVFBPort().run_webkit_tests_command(), ['xvfb-run'] + DeprecatedPort().script_shell_command('new-run-webkit-tests') + ['--chromium', '--skip-failing-tests'])
index 0866c4b..49d6b40 100644 (file)
@@ -28,7 +28,7 @@
 
 import unittest2 as unittest
 
-from webkitpy.common.config.ports import ChromiumPort, ChromiumAndroidPort, ChromiumXVFBPort
+from webkitpy.common.config.ports import MacPort, MacWK2Port
 from webkitpy.tool.mocktool import MockOptions, MockTool
 from webkitpy.tool.steps.update import Update
 
@@ -41,14 +41,11 @@ class UpdateTest(unittest.TestCase):
         step = Update(tool, options)
         self.assertEqual(["mock-update-webkit"], step._update_command())
 
-        tool._deprecated_port = ChromiumPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command())
+        tool._deprecated_port = MacPort()
+        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())
 
-        tool._deprecated_port = ChromiumXVFBPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command())
-
-        tool._deprecated_port = ChromiumAndroidPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update", "--chromium-android"], step._update_command())
+        tool._deprecated_port = MacWK2Port()
+        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())
 
     def test_update_command_interactive(self):
         tool = MockTool()
@@ -56,11 +53,8 @@ class UpdateTest(unittest.TestCase):
         step = Update(tool, options)
         self.assertEqual(["mock-update-webkit"], step._update_command())
 
-        tool._deprecated_port = ChromiumPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command())
-
-        tool._deprecated_port = ChromiumXVFBPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command())
+        tool._deprecated_port = MacPort()
+        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())
 
-        tool._deprecated_port = ChromiumAndroidPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--chromium-android"], step._update_command())
+        tool._deprecated_port = MacWK2Port()
+        self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command())