summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/run_webkit_tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/layout_tests/run_webkit_tests.py')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index ff85852..2d98ad8 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -354,9 +354,18 @@ class TestRunner:
# Keep the tests in alphabetical order.
# TODO: Remove once tests are fixed so they can be run in any order.
test_list.reverse()
- test_lists.append((directory, test_list))
+ test_list_tuple = (directory, test_list)
+ if directory == 'LayoutTests' + os.sep + 'http':
+ http_tests = test_list_tuple
+ else:
+ test_lists.append(test_list_tuple)
test_lists.sort(lambda a, b: cmp(len(b), len(a)))
+ # 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.
+ test_lists.insert(0, http_tests)
+
filename_queue = Queue.Queue()
for item in test_lists:
filename_queue.put(item)