diff options
| author | vadimsh <vadimsh@chromium.org> | 2014-10-20 05:28:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-20 12:29:42 +0000 |
| commit | 1eaeb298383496bc150b75bfab399dbcb650c0ab (patch) | |
| tree | b13308b3f4d23b2edd0a77b893487c61e74d4e9e /testing | |
| parent | 10e58e62b3dff1340532cb5986315e7174186497 (diff) | |
| download | chromium_src-1eaeb298383496bc150b75bfab399dbcb650c0ab.zip chromium_src-1eaeb298383496bc150b75bfab399dbcb650c0ab.tar.gz chromium_src-1eaeb298383496bc150b75bfab399dbcb650c0ab.tar.bz2 | |
Pass extra env variables also to the symbolizer script.
In particular LLVM_SYMBOLIZER_PATH is needed by asan_symbolize.py.
Also explicitly wait for test launcher to finish running and use its return
code as an overall exit code of the test. asan_symbolize.py always returns
0 (if it doesn't crash), not very useful.
BUG=424280
R=earthdok@chromium.org
Review URL: https://codereview.chromium.org/639713009
Cr-Commit-Position: refs/heads/master@{#300252}
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/test_env.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/testing/test_env.py b/testing/test_env.py index 1a41790..4c19427 100755 --- a/testing/test_env.py +++ b/testing/test_env.py @@ -174,10 +174,11 @@ def run_executable(cmd, env): p1 = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE, stderr=sys.stdout) p2 = subprocess.Popen(["../tools/valgrind/asan/asan_symbolize.py"], - stdin=p1.stdout) + env=env, stdin=p1.stdout) p1.stdout.close() # Allow p1 to receive a SIGPIPE if p2 exits. + p1.wait() p2.wait() - return p2.returncode + return p1.returncode else: return subprocess.call(cmd, env=env) except OSError: |