diff options
| author | phoglund <phoglund@chromium.org> | 2015-02-25 06:30:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-25 14:31:43 +0000 |
| commit | 207c1a328efe47f10bb0fb41411936051b2bf062 (patch) | |
| tree | 698172be3748ea41baa34fbfc040dbf43eff1822 /testing/test_env.py | |
| parent | 27f196cd2c3ef8347cd49ca0aaf42ee0b369c7fa (diff) | |
| download | chromium_src-207c1a328efe47f10bb0fb41411936051b2bf062.zip chromium_src-207c1a328efe47f10bb0fb41411936051b2bf062.tar.gz chromium_src-207c1a328efe47f10bb0fb41411936051b2bf062.tar.bz2 | |
Revert of Remove LSan options/suppressions from test_env.py. (patchset #1 id:1 of https://codereview.chromium.org/940033002/)
Reason for revert:
Breaks Linux ASAN:
https://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Builder/builds/19163/steps/isolate%20tests/logs/stdio
The error is:
MappingError: Input file /mnt/data/b/build/slave/Linux_ASan_LSan_Builder/build/src/tools/lsan/suppressions.txt doesn't exist
Original issue's description:
> Remove LSan options/suppressions from test_env.py.
>
> Those are now compiled into the executable.
> Also remove tools/lsan/ which used to house the suppressions file.
>
> BUG=302040
> R=kjellander@chromium.org
>
> Committed: https://crrev.com/09fef383665c6d75776bb0b649b29685b38ce617
> Cr-Commit-Position: refs/heads/master@{#318035}
TBR=kjellander@chromium.org,earthdok@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=302040
Review URL: https://codereview.chromium.org/956603004
Cr-Commit-Position: refs/heads/master@{#318043}
Diffstat (limited to 'testing/test_env.py')
| -rwxr-xr-x | testing/test_env.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/testing/test_env.py b/testing/test_env.py index 052df67..d19f74f 100755 --- a/testing/test_env.py +++ b/testing/test_env.py @@ -108,6 +108,10 @@ def get_sanitizer_env(cmd, asan, lsan, msan, tsan): # be a lot of incomplete stack traces in the reports. extra_env['LD_LIBRARY_PATH'] = '/usr/lib/x86_64-linux-gnu/debug:' + suppressions_file = os.path.join(ROOT_DIR, 'tools', 'lsan', + 'suppressions.txt') + lsan_options += ['suppressions=%s' % suppressions_file, + 'print_suppressions=1'] extra_env['LSAN_OPTIONS'] = ' '.join(lsan_options) if msan: |