diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:14:53 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:14:53 +0000 |
| commit | f8bddcfb577500d541351efa8986cc89d8859d02 (patch) | |
| tree | d268d9b055f6a8365f1486ae9a26256448b2eae7 /webkit/tools/layout_tests/layout_package | |
| parent | d3d60c5b64b64817b18fe08501b3b3fb24c23b58 (diff) | |
| download | chromium_src-f8bddcfb577500d541351efa8986cc89d8859d02.zip chromium_src-f8bddcfb577500d541351efa8986cc89d8859d02.tar.gz chromium_src-f8bddcfb577500d541351efa8986cc89d8859d02.tar.bz2 | |
Fix a crasher with --run-singly that was introduced by http://codereview.chromium.org/18023
Review URL: http://codereview.chromium.org/18167
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/layout_package')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_shell_thread.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_shell_thread.py b/webkit/tools/layout_tests/layout_package/test_shell_thread.py index eb2faf7..e34c83e 100644 --- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py +++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py @@ -105,7 +105,7 @@ def StartTestShell(command, args): class SingleTestThread(threading.Thread): """Thread wrapper for running a single test file.""" def __init__(self, test_shell_command, shell_args, test_uri, filename, - test_types, test_args): + test_types, test_args, target): """ Args: test_uri: full file:// or http:// URI of the test file to be run @@ -120,6 +120,7 @@ class SingleTestThread(threading.Thread): self._filename = filename self._test_types = test_types self._test_args = test_args + self._target = target self._single_test_failures = [] def run(self): @@ -128,7 +129,8 @@ class SingleTestThread(threading.Thread): self._filename, self._test_uri, self._test_types, - self._test_args) + self._test_args, + self._target) def GetFailures(self): return self._single_test_failures @@ -220,7 +222,8 @@ class TestShellThread(threading.Thread): test_uri, filename, self._test_types, - self._test_args) + self._test_args, + self._options.target) worker.start() worker.join(self._time_out_sec) if worker.isAlive(): |