summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-06 18:12:05 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-06 18:12:05 +0000
commitba138bcf2d8adfb9e67c2e493e60ea22baa83108 (patch)
tree3bd128081e3601b84cdfe3b5a8a92a09d878ff6f /webkit
parent561abe688fc5ebcec902ea6cc2ccb4122441595e (diff)
downloadchromium_src-ba138bcf2d8adfb9e67c2e493e60ea22baa83108.zip
chromium_src-ba138bcf2d8adfb9e67c2e493e60ea22baa83108.tar.gz
chromium_src-ba138bcf2d8adfb9e67c2e493e60ea22baa83108.tar.bz2
Fix test running break. TBR.
Review URL: http://codereview.chromium.org/63013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index cfde9e2..35f5a53 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -316,6 +316,8 @@ class TestRunner:
test_file_parts = test_file.split('/', 1)
directory = test_file_parts[0]
return_value = os.path.join(return_value, directory)
+ if len(test_file_parts) is not 2:
+ break
test_file = test_file_parts[1]
return return_value
@@ -359,13 +361,13 @@ class TestRunner:
filename_queue.put(item)
return filename_queue
- def _GetTestShellArgs(self):
+ def _GetTestShellArgs(self, index):
"""Returns the tuple of arguments for tests and for test_shell."""
shell_args = []
test_args = test_type_base.TestArguments()
if not self._options.no_pixel_tests:
png_path = os.path.join(self._options.results_directory,
- "png_result%s.png" % i)
+ "png_result%s.png" % index)
shell_args.append("--pixel-tests=" + png_path)
test_args.png_path = png_path
@@ -415,7 +417,7 @@ class TestRunner:
test_types.append(t(self._options.platform,
self._options.results_directory))
- test_args, shell_args = self._GetTestShellArgs()
+ test_args, shell_args = self._GetTestShellArgs(i)
thread = test_shell_thread.TestShellThread(filename_queue,
test_shell_command,
test_types,