Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4005)

Unified Diff: scripts/slave/compile.py

Issue 357673002: Do not pass additional TSan options when building and running TSan tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/runtest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/compile.py
diff --git a/scripts/slave/compile.py b/scripts/slave/compile.py
index bdeea986a6cdccd4138da5bf01b260d2a078de92..6fc0b8e838e77c08fb87cbbd7b6d748c898bd07f 100755
--- a/scripts/slave/compile.py
+++ b/scripts/slave/compile.py
@@ -572,16 +572,6 @@ def common_make_settings(
command.append('-r')
return
- if options.llvm_tsan:
- supp_path = os.path.join(options.src_dir,
- 'tools', 'valgrind', 'tsan_v2', 'suppressions.txt')
- # Do not report thread leaks when running executables compiled with TSan.
- # Use the suppressions file to avoid reporting known errors during
- # compilation.
- # http://dev.chromium.org/developers/testing/threadsanitizer-tsan-v2
- # contains other options that might be worth adding.
- env['TSAN_OPTIONS'] = 'report_thread_leaks=0 suppressions=%s' % supp_path
-
if compiler in ('goma', 'goma-clang', 'jsonclang'):
print 'using', compiler
if compiler == 'goma':
@@ -767,12 +757,6 @@ def main_ninja(options, args):
maybe_set_official_build_envvars(options, env)
- if options.llvm_tsan:
- # Do not report thread leaks when running executables compiled with TSan.
- # http://dev.chromium.org/developers/testing/threadsanitizer-tsan-v2
- # contains other options that might be worth adding.
- env['TSAN_OPTIONS'] = 'report_thread_leaks=0'
-
if options.compiler:
print 'using', options.compiler
« no previous file with comments | « no previous file | scripts/slave/runtest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698