Commit 09fef383 authored by earthdok's avatar earthdok Committed by Commit bot

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}
parent e917b497
...@@ -108,10 +108,6 @@ def get_sanitizer_env(cmd, asan, lsan, msan, tsan): ...@@ -108,10 +108,6 @@ def get_sanitizer_env(cmd, asan, lsan, msan, tsan):
# be a lot of incomplete stack traces in the reports. # be a lot of incomplete stack traces in the reports.
extra_env['LD_LIBRARY_PATH'] = '/usr/lib/x86_64-linux-gnu/debug:' 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) extra_env['LSAN_OPTIONS'] = ' '.join(lsan_options)
if msan: if msan:
......
# 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)
# Moved to build/sanitizers/lsan_suppressions.cc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment