diff options
5 files changed, 2 insertions, 14 deletions
diff --git a/infra/bots/infrabots.isolate b/infra/bots/infrabots.isolate index 0b40bea416..b08e836910 100644 --- a/infra/bots/infrabots.isolate +++ b/infra/bots/infrabots.isolate @@ -1,7 +1,6 @@ { 'variables': { 'files': [ - '../../tools/tsan.supp', '../../tools/valgrind.supp', './', ], diff --git a/infra/bots/recipe_modules/flavor/xsan_flavor.py b/infra/bots/recipe_modules/flavor/xsan_flavor.py index 2567b01a0d..9ecd4c980d 100644 --- a/infra/bots/recipe_modules/flavor/xsan_flavor.py +++ b/infra/bots/recipe_modules/flavor/xsan_flavor.py @@ -54,12 +54,9 @@ class XSanFlavorUtils(default_flavor.DefaultFlavorUtils): def step(self, name, cmd, env=None, **kwargs): """Wrapper for the Step API; runs a step as appropriate for this flavor.""" - skia_dir = self.m.vars.skia_dir - tsan_suppressions = skia_dir.join('tools', 'tsan.supp') env = dict(env or {}) env['ASAN_OPTIONS'] = 'symbolize=1 detect_leaks=1' env['LSAN_OPTIONS'] = 'symbolize=1 print_suppressions=1' - env['TSAN_OPTIONS'] = 'suppressions=%s' % tsan_suppressions self.m.vars.default_env['PATH'] = '%%(PATH)s:%s' % ( self.m.vars.slave_dir.join('llvm-build', 'Release+Asserts', 'bin')) env['LD_LIBRARY_PATH'] = self.m.vars.slave_dir.join( diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index ec46d0d3c3..8bf7217125 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -322,8 +322,7 @@ "LD_LIBRARY_PATH": "[SLAVE_BUILD]/third_party/externals/llvm/msan_out/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": "%(PATH)s:[SLAVE_BUILD]/llvm-build/Release+Asserts/bin", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp" + "SKIA_OUT": "[SLAVE_BUILD]/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index 32e47987d6..0087bf6e8d 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -321,8 +321,7 @@ "LD_LIBRARY_PATH": "[SLAVE_BUILD]/third_party/externals/llvm/msan_out/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": "%(PATH)s:[SLAVE_BUILD]/llvm-build/Release+Asserts/bin", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp" + "SKIA_OUT": "[SLAVE_BUILD]/out" }, "name": "dm" }, diff --git a/tools/tsan.supp b/tools/tsan.supp deleted file mode 100644 index 70cb6dceba..0000000000 --- a/tools/tsan.supp +++ /dev/null @@ -1,6 +0,0 @@ -# Suppressions for Thread Sanitizer -# -# CAREFUL! Comments must go on their own line or your suppressions will silently fail. - -# WebP races (harmlessly) choosing function pointers for SIMD versions of some of its functions. -race:third_party/externals/libwebp |