Do not pass additional TSan options when building and running TSan tests.

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 554 matching lines @@
       env['AS'] = crosstool + '-as'
       env['CC'] = ccache + crosstool + '-gcc'
       env['CXX'] = ccache + crosstool + '-g++'
       env['LD'] = crosstool + '-ld'
       env['RANLIB'] = crosstool + '-ranlib'
       command.append('-j%d' % jobs)
       # Don't use build-in rules.
       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':
       assert options.goma_dir
       env['CC'] = 'gcc'
       env['CXX'] = 'g++'
       env['PATH'] = ':'.join([options.goma_dir, env['PATH']])
     elif compiler == 'goma-clang':
       assert options.goma_dir
       env['CC'] = 'clang'
@@ skipping 165 matching lines @@
       # from compile.py.
       ninja_clobber(options.target_output_dir)
 
     if options.verbose:
       command.append('-v')
     command.extend(options.build_args)
     command.extend(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
 
     if options.compiler in ('goma', 'goma-clang', 'jsonclang'):
       assert options.goma_dir
       if chromium_utils.IsWindows():
         # rewrite cc, cxx line in output_dir\build.ninja.
         # in winja, ninja -t msvc is used to run $cc/$cxx to collect
         # dependency with "cl /showIncludes" and generates dependency info.
         # ninja -t msvc uses environment in output_dir\environment.*,
@@ skipping 459 matching lines @@
   options.target_output_dir = get_target_build_dir(options.build_tool,
       options.src_dir, options.target, 'iphoneos' in args)
   options.clobber = (options.clobber or
       landmines_triggered(options.target_output_dir))
 
   return main(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(real_main())