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

6 files changed, 5 insertions, 15 deletions

diff --git a/infra/bots/infrabots.isolate b/infra/bots/infrabots.isolate
index d7248f240e..0b40bea416 100644
--- a/infra/bots/infrabots.isolate
+++ b/infra/bots/infrabots.isolate
@@ -1,9 +1,7 @@
 {
   'variables': {
     'files': [
-      '../../tools/lsan.supp',
       '../../tools/tsan.supp',
-      '../../tools/ubsan.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 b4bff4911d..2567b01a0d 100644
--- a/infra/bots/recipe_modules/flavor/xsan_flavor.py
+++ b/infra/bots/recipe_modules/flavor/xsan_flavor.py
@@ -55,15 +55,11 @@ 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
-    lsan_suppressions = skia_dir.join('tools', 'lsan.supp')
     tsan_suppressions = skia_dir.join('tools', 'tsan.supp')
-    ubsan_suppressions = skia_dir.join('tools', 'ubsan.supp')
     env = dict(env or {})
     env['ASAN_OPTIONS'] = 'symbolize=1 detect_leaks=1'
-    env['LSAN_OPTIONS'] = ('symbolize=1 print_suppressions=1 suppressions=%s' %
-                           lsan_suppressions)
+    env['LSAN_OPTIONS'] = 'symbolize=1 print_suppressions=1'
     env['TSAN_OPTIONS'] = 'suppressions=%s' % tsan_suppressions
-    env['UBSAN_OPTIONS'] = 'suppressions=%s' % ubsan_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 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"
   },
diff --git a/tools/lsan.supp b/tools/lsan.supp
deleted file mode 100644
index b993fa508f..0000000000
--- a/tools/lsan.supp
+++ /dev/null
@@ -1 +0,0 @@
-# Supressions for LSAN.
diff --git a/tools/ubsan.supp b/tools/ubsan.supp
deleted file mode 100644
index f8be62835f..0000000000
--- a/tools/ubsan.supp
+++ /dev/null
@@ -1 +0,0 @@
-# Supressions for UBSAN.