From b987afa7cca850c6cac9918fced337ad3bb902cf Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 1 Sep 2016 08:08:03 -0700 Subject: Remove empty {lsan,ubsan}.supp files. We never used ubsan.supp, and LSAN suppressions are now built into the test binaries. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302803003 CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN-Trybot Review-Url: https://codereview.chromium.org/2302803003 --- .../Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json | 5 ++--- .../Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'infra/bots/recipes/swarm_test.expected') 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 f4c2bff7dd..ec46d0d3c3 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 @@ -320,11 +320,10 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[SLAVE_BUILD]/third_party/externals/llvm/msan_out/lib", - "LSAN_OPTIONS": "symbolize=1 print_suppressions=1 suppressions=[SLAVE_BUILD]/skia/tools/lsan.supp", + "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", - "UBSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/ubsan.supp" + "TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp" }, "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 2914c9c2a5..32e47987d6 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 @@ -319,11 +319,10 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[SLAVE_BUILD]/third_party/externals/llvm/msan_out/lib", - "LSAN_OPTIONS": "symbolize=1 print_suppressions=1 suppressions=[SLAVE_BUILD]/skia/tools/lsan.supp", + "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", - "UBSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/ubsan.supp" + "TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp" }, "name": "dm" }, -- cgit v1.2.3