Fix webkitpy tests after rev 224549.
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Nov 2017 00:30:45 +0000 (00:30 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Nov 2017 00:30:45 +0000 (00:30 +0000)
Unreviewed build fix.

* Scripts/webkitpy/common/config/ports.py:
(WinCairoPort.run_webkit_tests_command):
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_wincairo_port):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/common/config/ports.py
Tools/Scripts/webkitpy/common/config/ports_unittest.py

index a588a2b..29c16e1 100644 (file)
@@ -1,3 +1,14 @@
+2017-11-07  Don Olmstead  <don.olmstead@sony.com>
+
+        Fix webkitpy tests after rev 224549.
+
+        Unreviewed build fix.
+
+        * Scripts/webkitpy/common/config/ports.py:
+        (WinCairoPort.run_webkit_tests_command):
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+        (DeprecatedPortTest.test_wincairo_port):
+
 2017-11-07  Aakash Jain  <aakash_jain@apple.com>
 
         Enable webkitpy EWS bubbles
index c092132..778b8f9 100644 (file)
@@ -195,6 +195,11 @@ class WinCairoPort(DeprecatedPort):
         command.append('--64-bit')
         return command
 
+    def run_webkit_tests_command(self, build_style=None):
+        command = super(WinCairoPort, self).run_webkit_tests_command(build_style)
+        command.append("--wincairo")
+        return command
+
 
 class GtkWK2Port(DeprecatedPort):
     port_flag_name = "gtk-wk2"
index 20f0e80..6c32fd2 100644 (file)
@@ -59,5 +59,5 @@ class DeprecatedPortTest(unittest.TestCase):
     def test_wincairo_port(self):
         self.assertEqual(WinCairoPort().flag(), "--port=wincairo")
         self.assertEqual(WinCairoPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--wincairo"])
-        self.assertEqual(WinCairoPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wincairo", "--64-bit", DeprecatedPort().makeArgs()])
-        self.assertEqual(WinCairoPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wincairo", "--64-bit", DeprecatedPort().makeArgs()])
+        self.assertEqual(WinCairoPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wincairo", "--64-bit"])
+        self.assertEqual(WinCairoPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wincairo", "--64-bit"])