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

Side by Side Diff: infra/bots/recipe_modules/flavor/xsan_flavor.py

Issue 2300193002: Remove tsan.supp. (Closed)
Patch Set: rebase Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 5
6 """Utils for running under *SAN""" 6 """Utils for running under *SAN"""
7 7
8 8
9 import default_flavor 9 import default_flavor
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 # TODO(benjaminwagner): Figure out how to add this to Skia DEPS for 47 # TODO(benjaminwagner): Figure out how to add this to Skia DEPS for
48 # target_os 'llvm'. 48 # target_os 'llvm'.
49 self.m.file.copytree( 49 self.m.file.copytree(
50 'copy llvm-build', 50 'copy llvm-build',
51 self.m.vars.checkout_root.join('src', 'third_party', 'llvm-build'), 51 self.m.vars.checkout_root.join('src', 'third_party', 'llvm-build'),
52 swarming_out_dir.join('llvm-build'), 52 swarming_out_dir.join('llvm-build'),
53 symlinks=True) 53 symlinks=True)
54 54
55 def step(self, name, cmd, env=None, **kwargs): 55 def step(self, name, cmd, env=None, **kwargs):
56 """Wrapper for the Step API; runs a step as appropriate for this flavor.""" 56 """Wrapper for the Step API; runs a step as appropriate for this flavor."""
57 skia_dir = self.m.vars.skia_dir
58 tsan_suppressions = skia_dir.join('tools', 'tsan.supp')
59 env = dict(env or {}) 57 env = dict(env or {})
60 env['ASAN_OPTIONS'] = 'symbolize=1 detect_leaks=1' 58 env['ASAN_OPTIONS'] = 'symbolize=1 detect_leaks=1'
61 env['LSAN_OPTIONS'] = 'symbolize=1 print_suppressions=1' 59 env['LSAN_OPTIONS'] = 'symbolize=1 print_suppressions=1'
62 env['TSAN_OPTIONS'] = 'suppressions=%s' % tsan_suppressions
63 self.m.vars.default_env['PATH'] = '%%(PATH)s:%s' % ( 60 self.m.vars.default_env['PATH'] = '%%(PATH)s:%s' % (
64 self.m.vars.slave_dir.join('llvm-build', 'Release+Asserts', 'bin')) 61 self.m.vars.slave_dir.join('llvm-build', 'Release+Asserts', 'bin'))
65 env['LD_LIBRARY_PATH'] = self.m.vars.slave_dir.join( 62 env['LD_LIBRARY_PATH'] = self.m.vars.slave_dir.join(
66 'third_party', 'externals', 'llvm', 'msan_out', 'lib') 63 'third_party', 'externals', 'llvm', 'msan_out', 'lib')
67 64
68 path_to_app = self.out_dir.join(cmd[0]) 65 path_to_app = self.out_dir.join(cmd[0])
69 new_cmd = [path_to_app] 66 new_cmd = [path_to_app]
70 new_cmd.extend(cmd[1:]) 67 new_cmd.extend(cmd[1:])
71 return self.m.run(self.m.step, name, cmd=new_cmd, env=env, **kwargs) 68 return self.m.run(self.m.step, name, cmd=new_cmd, env=env, **kwargs)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698