diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-12 19:26:07 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-12 19:26:07 +0000 |
| commit | 293fcfef6c72804e47994fdc1010385365b7bd32 (patch) | |
| tree | 3316456a9bd406e331d4dda6ef0a1646d6bccf5d | |
| parent | 747e616a9a3b274c94286e4b306cbec2d2fde37f (diff) | |
| download | chromium_src-293fcfef6c72804e47994fdc1010385365b7bd32.zip chromium_src-293fcfef6c72804e47994fdc1010385365b7bd32.tar.gz chromium_src-293fcfef6c72804e47994fdc1010385365b7bd32.tar.bz2 | |
Get rid of the concept of shardable directories. Just shard everything
by the lowest directory the test is in. This is an incremental step
in the direction of being able to fully parallelize the test running.
The only exception is the HTTP tests on Windows. They are currently
very flaky, and will only get more flaky if we shard them. Once Windows
is on Apache we can reconsider.
Review URL: http://codereview.chromium.org/542016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36028 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index b94a16f..9a4a9a8 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -158,16 +158,6 @@ class TestRunner: else: self._http_server = http_server.Lighttpd(options.results_directory) - self._shardable_directories = ['LayoutTests', 'fast', 'svg', 'loader', - 'editing'] - - # The http tests are very stable on mac/linux. - # TODO(ojan): Make the http server on Windows be apache so we can turn - # shard the http tests there as well. Switching to apache is what made them - # stable on linux/mac. - if sys.platform in ('darwin', 'linux2'): - self._shardable_directories.extend(['http', 'tests']) - self._websocket_server = websocket_server.PyWebSocket( options.results_directory) # disable wss server. need to install pyOpenSSL on buildbots. @@ -379,8 +369,12 @@ class TestRunner: directory = test_file_parts[0] test_file = test_file_parts[1] + # The http tests are very stable on mac/linux. + # TODO(ojan): Make the http server on Windows be apache so we can turn + # shard the http tests there as well. Switching to apache is what made them + # stable on linux/mac. return_value = directory - while (directory in self._shardable_directories and + while ((directory != 'http' or sys.platform in ('darwin', 'linux2')) and test_file.find(os.sep) >= 0): test_file_parts = test_file.split(os.sep, 1) directory = test_file_parts[0] |