Changeset 69770 in webkit

Timestamp:

Oct 14, 2010 9:40:08 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-10-14 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

ChromiumXVFBPort.run_webkit_tests_command has infinite recursion
​https://bugs.webkit.org/show_bug.cgi?id=47655

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

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/ports.py (modified) (1 diff)
• Scripts/webkitpy/common/config/ports_unittest.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-14  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        ChromiumXVFBPort.run_webkit_tests_command has infinite recursion
+        https://bugs.webkit.org/show_bug.cgi?id=47655
+
+        * Scripts/webkitpy/common/config/ports.py:
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+
 2010-10-13  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/config/ports.py

@@ -243 +243 @@
     def run_webkit_tests_command(cls):
         # FIXME: We should find a better way to do this.
-        return ["xvfb-run"] + cls.run_webkit_tests_command()
+        return ["xvfb-run"] + ChromiumPort.run_webkit_tests_command()

trunk/WebKitTools/Scripts/webkitpy/common/config/ports_unittest.py

@@ -30 +30 @@
 import unittest
 
-from webkitpy.common.config.ports import WebKitPort, MacPort, GtkPort, QtPort, ChromiumPort
+from webkitpy.common.config.ports import *
 
 
@@ -70 +70 @@
         self.assertEquals(ChromiumPort.update_webkit_command(), [WebKitPort.script_path("update-webkit"), "--chromium"])
 
+    def test_chromium_xvfb_port(self):
+        self.assertEquals(ChromiumXVFBPort.run_webkit_tests_command(), ["xvfb-run", "WebKitTools/Scripts/new-run-webkit-tests", "--chromium", "--use-drt", "--no-pixel-tests"])
 
 if __name__ == '__main__':