Changeset 57422 in webkit

Timestamp:

Apr 10, 2010 3:17:15 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

run_webkit_tests.py shouldn't have platform-specific logic
​https://bugs.webkit.org/show_bug.cgi?id=37387

Dirk Pranke pointed out that my last patch was wrong because I
introduced platform-specific logic into run_webkit_tests.py, limiting
the parallelism in Chromium to work around a bug in the main Mac port.

• Scripts/webkitpy/common/system/executive.py:
  • Fix a typo pointed out by Chris Jerdonek.
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/mac.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/mac.py (modified) (5 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-10  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        run_webkit_tests.py shouldn't have platform-specific logic
+        https://bugs.webkit.org/show_bug.cgi?id=37387
+
+        Dirk Pranke pointed out that my last patch was wrong because I
+        introduced platform-specific logic into run_webkit_tests.py, limiting
+        the parallelism in Chromium to work around a bug in the main Mac port.
+
+        * Scripts/webkitpy/common/system/executive.py:
+            - Fix a typo pointed out by Chris Jerdonek.
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-04-10  Robert Hogan  <robert@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/system/executive.py

@@ -128 +128 @@
         # Darn.  We don't have the multiprocessing package.
         system_name = platform.system()
-        if system_name == "Dawin":
+        if system_name == "Darwin":
             return int(self.run_command(["sysctl", "-n", "hw.ncpu"]))
         elif system_name == "Windows":

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py

@@ -43 +43 @@
 import websocket_server
 
+from webkitpy.common.system.executive import Executive
+
 # Python bug workaround.  See Port.wdiff_text() for an explanation.
 _wdiff_available = True
@@ -60 +62 @@
         return flags_by_configuration[configuration]
 
-    def __init__(self, port_name=None, options=None):
+    def __init__(self, port_name=None, options=None, executive=Executive()):
         self._name = port_name
         self._options = options
@@ -67 +69 @@
         self._webkit_base_dir = None
         self._websocket_server = None
+        self._executive = executive
+
+    def default_num_dump_render_trees(self):
+        """Return the number of DumpRenderTree instances to use for this
+        port."""
+        return self._executive.cpu_count()
 
     def baseline_path(self):

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -46 +46 @@
 
 import webkitpy
-import webkitpy.common.system.executive as executive
 import webkitpy.common.system.ospath as ospath
 
@@ -66 +65 @@
            options.pixel_tests is None):
             options.pixel_tests = False
+
+    def default_num_dump_render_trees(self):
+        # FIXME: new-run-webkit-tests is unstable on Mac running more than
+        # four threads in parallel.
+        # See https://bugs.webkit.org/show_bug.cgi?id=36622
+        num_dump_render_trees = base.Port.default_num_dump_render_trees(self)
+        if num_dump_render_trees > 4:
+            return 4
+        return num_dump_render_trees
 
     def baseline_path(self):
@@ -86 +94 @@
             self.flag_from_configuration(self._options.configuration),
         ]
-        if executive.run_command(build_drt_command, return_exit_code=True):
+        if self._executive.run_command(build_drt_command, return_exit_code=True):
             return False
 
@@ -99 +107 @@
         java_tests_path = os.path.join(self.layout_tests_dir(), "java")
         build_java = ["/usr/bin/make", "-C", java_tests_path]
-        if executive.run_command(build_java, return_exit_code=True):
+        if self._executive.run_command(build_java, return_exit_code=True):
             _log.error("Failed to build Java support files: %s" % build_java)
             return False
@@ -325 +333 @@
     def _webkit_build_directory(self, args):
         cmd = [self.script_path("webkit-build-directory")] + args
-        return executive.run_command(cmd).rstrip()
+        return self._executive.run_command(cmd).rstrip()
 
     def _build_path(self, *comps):

trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -1428 +1428 @@
     if not options.num_dump_render_trees:
         # FIXME: Investigate perf/flakiness impact of using cpu_count + 1.
-        options.num_dump_render_trees = executive.cpu_count()
-        # FIXME: new-run-webkit-tests is unstable on Mac running more than
-        # four threads in parallel.
-        # See https://bugs.webkit.org/show_bug.cgi?id=36622
-        if platform.system() == "Dawin" and options.num_dump_render_trees > 4:
-            options.num_dump_render_trees = 4
+        options.num_dump_render_trees = port_obj.default_num_dump_render_trees()
 
     write = create_logging_writer(options, 'config')