summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/run_webkit_tests.py
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 03:33:11 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 03:33:11 +0000
commit575ddc4bd64d7a5957eb9c20b27b922fa4c3584b (patch)
tree379240c503d7a72412045a18b2c5a2ac0d5d18fb /webkit/tools/layout_tests/run_webkit_tests.py
parent0c727515fb5c483f7f030837bb683ea808bcc8fb (diff)
downloadchromium_src-575ddc4bd64d7a5957eb9c20b27b922fa4c3584b.zip
chromium_src-575ddc4bd64d7a5957eb9c20b27b922fa4c3584b.tar.gz
chromium_src-575ddc4bd64d7a5957eb9c20b27b922fa4c3584b.tar.bz2
Fix run webkit tests empty path issue with new LayoutTests directory
Search LayoutTests first in third_party/WebKit and fallback to webkit/data if it does not exist. TEST=buildbot should work BUG=12881 Review URL: http://codereview.chromium.org/155474 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/run_webkit_tests.py')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 03ae887..566c105 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -83,7 +83,7 @@ class TestRunner:
_skipped_directories = set(['.svn', '_svn', 'resources'])
# Top-level directories to shard when running tests.
- _shardable_directories = set(['chrome', 'LayoutTests'])
+ _shardable_directories = set(['chrome', 'LayoutTests', 'pending'])
HTTP_SUBDIR = os.sep.join(['', 'http', ''])
@@ -1000,7 +1000,12 @@ def main(options, args):
options.time_out_ms = str(TestRunner.DEFAULT_TEST_TIMEOUT_MS)
# Include all tests if none are specified.
- paths = args
+ new_args = []
+ for arg in args:
+ if arg and arg != '':
+ new_args.append(arg)
+
+ paths = new_args
if not paths:
paths = []
if options.test_list: