summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests
diff options
context:
space:
mode:
authorojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 20:08:06 +0000
committerojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 20:08:06 +0000
commitc3196c5a313eb4f01227ec03ec11c30aca3bc7ad (patch)
tree7ec09decdd9a72c5200896265ab23fbbf2821cff /webkit/tools/layout_tests
parent4b7b08c669c09b1182ee29a7260c8a761b448909 (diff)
downloadchromium_src-c3196c5a313eb4f01227ec03ec11c30aca3bc7ad.zip
chromium_src-c3196c5a313eb4f01227ec03ec11c30aca3bc7ad.tar.gz
chromium_src-c3196c5a313eb4f01227ec03ec11c30aca3bc7ad.tar.bz2
Shard the fast and http directories on the V8-latest webkit bots.
With the layout tests dashboard we can identify new flakiness that results. If the flakiness is small and manageable, then we can turn this on for all the bots. Review URL: http://codereview.chromium.org/467005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests')
-rw-r--r--webkit/tools/layout_tests/layout_package/test_files.py4
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py11
2 files changed, 12 insertions, 3 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_files.py b/webkit/tools/layout_tests/layout_package/test_files.py
index ba99630..c94cd5b 100644
--- a/webkit/tools/layout_tests/layout_package/test_files.py
+++ b/webkit/tools/layout_tests/layout_package/test_files.py
@@ -21,7 +21,7 @@ _supported_file_extensions = set(['.html', '.shtml', '.xml', '.xhtml', '.pl',
_skipped_directories = set(['.svn', '_svn', 'resources', 'script-tests'])
# Top-level directories to shard when running tests.
-SHARDABLE_DIRECTORIES = set(['chrome', 'LayoutTests', 'pending'])
+ROOT_DIRECTORIES = set(['chrome', 'LayoutTests', 'pending'])
def GatherTestFiles(paths):
"""Generate a set of test files and return them.
@@ -33,7 +33,7 @@ def GatherTestFiles(paths):
paths_to_walk = set()
# if paths is empty, provide a pre-defined list.
if not paths:
- paths = SHARDABLE_DIRECTORIES
+ paths = ROOT_DIRECTORIES
for path in paths:
# If there's an * in the name, assume it's a glob pattern.
path = os.path.join(path_utils.LayoutTestsDir(path), path)
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index eec5b98..b9244de 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -135,6 +135,15 @@ class TestRunner:
else:
self._http_server = http_server.Lighttpd(options.results_directory)
+ self._shardable_directories = ['chrome', 'LayoutTests', 'pending']
+
+ # Experiment with more sharding on the V8-Lastest builders. Turn this on
+ # for all builders if the increased flakiness is sufficiently manageable.
+ if options.builder_name and options.builder_name.find("(V8-Latest)") != -1:
+ self._shardable_directories.append('fast')
+ self._shardable_directories.append('http')
+ self._shardable_directories.append('tests')
+
self._websocket_server = websocket_server.PyWebSocket(
options.results_directory)
# disable wss server. need to install pyOpenSSL on buildbots.
@@ -337,7 +346,7 @@ class TestRunner:
test_file = test_file_parts[1]
return_value = directory
- while directory in test_files.SHARDABLE_DIRECTORIES:
+ while directory in self._shardable_directories:
test_file_parts = test_file.split(os.sep, 1)
directory = test_file_parts[0]
return_value = os.path.join(return_value, directory)