diff options
| author | earthdok <earthdok@chromium.org> | 2015-02-25 05:31:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-25 13:32:17 +0000 |
| commit | 09fef383665c6d75776bb0b649b29685b38ce617 (patch) | |
| tree | 6cf97c1d8ee952fb53536542a728d4264018bef1 | |
| parent | e917b49708a65bcf4295ee872ea2fb8e94b3bbcf (diff) | |
| download | chromium_src-09fef383665c6d75776bb0b649b29685b38ce617.zip chromium_src-09fef383665c6d75776bb0b649b29685b38ce617.tar.gz chromium_src-09fef383665c6d75776bb0b649b29685b38ce617.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/940033002
Cr-Commit-Position: refs/heads/master@{#318035}
| -rwxr-xr-x | testing/test_env.py | 4 | ||||
| -rw-r--r-- | tools/lsan/PRESUBMIT.py | 33 | ||||
| -rw-r--r-- | tools/lsan/suppressions.txt | 1 |
3 files changed, 0 insertions, 38 deletions
diff --git a/testing/test_env.py b/testing/test_env.py index d19f74f..052df67 100755 --- a/testing/test_env.py +++ b/testing/test_env.py @@ -108,10 +108,6 @@ 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: diff --git a/tools/lsan/PRESUBMIT.py b/tools/lsan/PRESUBMIT.py deleted file mode 100644 index 1b7e971..0000000 --- a/tools/lsan/PRESUBMIT.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2013 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -""" -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into depot_tools. -""" - -import re - -def CheckChange(input_api, output_api): - errors = [] - - for f in input_api.AffectedFiles(): - if not f.LocalPath().endswith('suppressions.txt'): - continue - for line_num, line in enumerate(f.NewContents()): - line = line.strip() - if line.startswith('#') or not line: - continue - if not line.startswith('leak:'): - errors.append('"%s" should be "leak:..." in %s line %d' % - (line, f.LocalPath(), line_num)) - if errors: - return [output_api.PresubmitError('\n'.join(errors))] - return [] - -def CheckChangeOnUpload(input_api, output_api): - return CheckChange(input_api, output_api) - -def CheckChangeOnCommit(input_api, output_api): - return CheckChange(input_api, output_api) diff --git a/tools/lsan/suppressions.txt b/tools/lsan/suppressions.txt deleted file mode 100644 index afa832e..0000000 --- a/tools/lsan/suppressions.txt +++ /dev/null @@ -1 +0,0 @@ -# Moved to build/sanitizers/lsan_suppressions.cc |