Title: [89302] trunk/Tools
Revision
89302
Author
[email protected]
Date
2011-06-20 16:05:40 -0700 (Mon, 20 Jun 2011)

Log Message

2011-06-20  Dirk Pranke  <[email protected]>

        Reviewed by Ojan Vafai.

        new-run-webkit-tests: order shards by name, not number of tests
        https://bugs.webkit.org/show_bug.cgi?id=62753

        * Scripts/webkitpy/layout_tests/layout_package/manager.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (89301 => 89302)


--- trunk/Tools/ChangeLog	2011-06-20 23:02:58 UTC (rev 89301)
+++ trunk/Tools/ChangeLog	2011-06-20 23:05:40 UTC (rev 89302)
@@ -2,6 +2,15 @@
 
         Reviewed by Ojan Vafai.
 
+        new-run-webkit-tests: order shards by name, not number of tests
+        https://bugs.webkit.org/show_bug.cgi?id=62753
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+
+2011-06-20  Dirk Pranke  <[email protected]>
+
+        Reviewed by Ojan Vafai.
+
         we should only log the test names to the tests_run.txt files during layout_tests
         https://bugs.webkit.org/show_bug.cgi?id=62751
 

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py (89301 => 89302)


--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py	2011-06-20 23:02:58 UTC (rev 89301)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py	2011-06-20 23:05:40 UTC (rev 89302)
@@ -568,17 +568,14 @@
                 else:
                     tests_by_dir.setdefault(directory, [])
                     tests_by_dir[directory].append(test_input)
-            # Sort by the number of tests in the dir so that the ones with the
-            # most tests get run first in order to maximize parallelization.
-            # Number of tests is a good enough, but not perfect, approximation
-            # of how long that set of tests will take to run. We can't just use
-            # a PriorityQueue until we move to Python 2.6.
             for directory in tests_by_dir:
                 test_list = tests_by_dir[directory]
                 test_list_tuple = (directory, test_list)
                 test_lists.append(test_list_tuple)
-            test_lists.sort(lambda a, b: cmp(len(b[1]), len(a[1])))
 
+            # Sort the shards by directory name.
+            test_lists.sort(lambda a, b: cmp(a[0], b[0]))
+
         # Put the http tests first. There are only a couple hundred of them,
         # but each http test takes a very long time to run, so sorting by the
         # number of tests doesn't accurately capture how long they take to run.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to