diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 20:29:28 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 20:29:28 +0000 |
| commit | da9fac160e8d37a9d317346f700096cb0cd630bb (patch) | |
| tree | 9fd8968687199f84488e9a9b9db37f9959b008e2 /webkit | |
| parent | d4d91b1c67990fc11fcc7cd2c98aedd08a40ad0a (diff) | |
| download | chromium_src-da9fac160e8d37a9d317346f700096cb0cd630bb.zip chromium_src-da9fac160e8d37a9d317346f700096cb0cd630bb.tar.gz chromium_src-da9fac160e8d37a9d317346f700096cb0cd630bb.tar.bz2 | |
Resubmit http://codereview.chromium.org/55034 with one-line fix to test_shell_thread.py
Review URL: http://codereview.chromium.org/58003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_shell_thread.py | 8 |
1 files changed, 7 insertions, 1 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 73af63b..d76ebee 100644 --- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py +++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py @@ -102,7 +102,13 @@ def ProcessOutput(proc, filename, test_uri, test_types, test_args, target): def StartTestShell(command, args): """Returns the process for a new test_shell started in layout-tests mode.""" - cmd = command + ['--layout-tests'] + args + cmd = [] + # Hook for injecting valgrind or other runtime instrumentation, + # used by e.g. tools/valgrind/valgrind_tests.py. + wrapper = os.environ.get("BROWSER_WRAPPER", None) + if wrapper != None: + cmd += [wrapper] + cmd += command + ['--layout-tests'] + args return subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, |