diff options
| author | timurrrr <timurrrr@chromium.org> | 2015-02-12 13:50:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 21:51:36 +0000 |
| commit | 7e67df9eb52b99f100c8441ffc9cc73a412f4dff (patch) | |
| tree | 6e29ca5fd32128e36589d65c3c6065bc27053d76 | |
| parent | 0dcd918868251fdc1b2374bac0258806d82a7463 (diff) | |
| download | chromium_src-7e67df9eb52b99f100c8441ffc9cc73a412f4dff.zip chromium_src-7e67df9eb52b99f100c8441ffc9cc73a412f4dff.tar.gz chromium_src-7e67df9eb52b99f100c8441ffc9cc73a412f4dff.tar.bz2 | |
Assign symbolization_options on all the execution paths
Also, don't set ASAN_OPTIONS if there's nothing to set
This is a follow-up fix to https://codereview.chromium.org/920833002/
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/923743002
Cr-Commit-Position: refs/heads/master@{#316057}
| -rwxr-xr-x | testing/test_env.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/testing/test_env.py b/testing/test_env.py index 3564048..d19f74f 100755 --- a/testing/test_env.py +++ b/testing/test_env.py @@ -80,13 +80,16 @@ def get_sanitizer_env(cmd, asan, lsan, msan, tsan): symbolization_options = ['symbolize=0'] # Set the path to llvm-symbolizer to be used by asan_symbolize.py extra_env['LLVM_SYMBOLIZER_PATH'] = symbolizer_path + else: + symbolization_options = [] if asan: asan_options = symbolization_options[:] if lsan: asan_options.append('detect_leaks=1') - extra_env['ASAN_OPTIONS'] = ' '.join(asan_options) + if asan_options: + extra_env['ASAN_OPTIONS'] = ' '.join(asan_options) if sys.platform == 'darwin': isolate_output_dir = os.path.abspath(os.path.dirname(cmd[0])) |