summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 06:02:46 +0000
committerojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 06:02:46 +0000
commit151fdf125f9ceb511944791b8db58297de560c1b (patch)
treeb0e4fe3bd8ba0398cf54495bc9b329fe9a99b0c9 /webkit/tools
parent665a25f57ff6b21be3f6a87755ab784d6c18f9e5 (diff)
downloadchromium_src-151fdf125f9ceb511944791b8db58297de560c1b.zip
chromium_src-151fdf125f9ceb511944791b8db58297de560c1b.tar.gz
chromium_src-151fdf125f9ceb511944791b8db58297de560c1b.tar.bz2
Ensure that the http tests are always run first since they
take so long. Review URL: http://codereview.chromium.org/62090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-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)