Revert "Add suppressions to sanitizers for bazel builds"

14 files changed, 2 insertions, 50 deletions

diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index 687ff67914..a56db77d75 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -62,7 +62,7 @@ def _maybe_update_cc_library_hdrs(hdrs):
 def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
                     external_deps = [], deps = [], standalone = False,
                     language = "C++", testonly = False, visibility = None,
-                    alwayslink = 0, data = []):
+                    alwayslink = 0):
   copts = []
   if language.upper() == "C":
     copts = if_not_windows(["-std=c99"])
@@ -87,7 +87,6 @@ def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
         "include"
     ],
     alwayslink = alwayslink,
-    data = data,
   )
 
 def grpc_proto_plugin(name, srcs = [], deps = []):
diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD
index e5a9e36457..c554b20148 100644
--- a/test/core/channel/BUILD
+++ b/test/core/channel/BUILD
@@ -105,7 +105,6 @@ grpc_cc_test(
     language = "C++",
     deps = [
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
     external_deps = [
         "gtest",
diff --git a/test/core/security/BUILD b/test/core/security/BUILD
index 12aa84d93b..70bcc8c9c3 100644
--- a/test/core/security/BUILD
+++ b/test/core/security/BUILD
@@ -183,7 +183,6 @@ grpc_cc_test(
         "//:gpr",
         "//:gpr_base",
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -196,7 +195,6 @@ grpc_cc_test(
         "//:gpr",
         "//:gpr_base",
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -208,7 +206,6 @@ grpc_cc_test(
         "//:alts_util",
         "//:gpr",
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -223,6 +220,5 @@ grpc_cc_test(
         "//:grpc_secure",
         "//:tsi", 
         "//:tsi_interface",
-        "//test/core/util:gpr_test_util",
     ],
 )
diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD
index 7ca1c1d943..84fb3a1421 100644
--- a/test/core/transport/BUILD
+++ b/test/core/transport/BUILD
@@ -129,7 +129,6 @@ grpc_cc_test(
     language = "C++",
     deps = [
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
     external_deps = [
         "gtest",
diff --git a/test/core/tsi/alts/crypt/BUILD b/test/core/tsi/alts/crypt/BUILD
index abe1e83656..cf9dbca316 100644
--- a/test/core/tsi/alts/crypt/BUILD
+++ b/test/core/tsi/alts/crypt/BUILD
@@ -27,7 +27,6 @@ grpc_cc_test(
         "//:alts_frame_protector",
         "//:gpr",
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
diff --git a/test/core/tsi/alts/frame_protector/BUILD b/test/core/tsi/alts/frame_protector/BUILD
index 6ff3015f4d..dd1966b379 100644
--- a/test/core/tsi/alts/frame_protector/BUILD
+++ b/test/core/tsi/alts/frame_protector/BUILD
@@ -27,7 +27,6 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -40,7 +39,6 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -56,7 +54,6 @@ grpc_cc_test(
         "//:tsi_interface",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
         "//test/core/tsi:transport_security_test_lib",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -70,6 +67,5 @@ grpc_cc_test(
         "//:gpr_base",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
-        "//test/core/util:gpr_test_util",
     ],
 )
diff --git a/test/core/tsi/alts/handshaker/BUILD b/test/core/tsi/alts/handshaker/BUILD
index 3f1a681c1a..809742744c 100644
--- a/test/core/tsi/alts/handshaker/BUILD
+++ b/test/core/tsi/alts/handshaker/BUILD
@@ -37,7 +37,6 @@ grpc_cc_test(
         "//:tsi",
         "//:tsi_interface",
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -48,7 +47,6 @@ grpc_cc_test(
     deps = [
         ":alts_handshaker_service_api_test_lib",
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -62,7 +60,6 @@ grpc_cc_test(
         "//:gpr_base",
         "//:grpc",
         "//:tsi",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -74,7 +71,6 @@ grpc_cc_test(
         ":alts_handshaker_service_api_test_lib",
         "//:grpc",
         "//:tsi",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -85,7 +81,6 @@ grpc_cc_test(
     deps = [
         "//:alts_util",
         "//:grpc",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
diff --git a/test/core/tsi/alts/zero_copy_frame_protector/BUILD b/test/core/tsi/alts/zero_copy_frame_protector/BUILD
index a3b797327e..2b41dae043 100644
--- a/test/core/tsi/alts/zero_copy_frame_protector/BUILD
+++ b/test/core/tsi/alts/zero_copy_frame_protector/BUILD
@@ -28,7 +28,6 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc_base_c",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -41,7 +40,6 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -55,6 +53,5 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc_base_c",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
-        "//test/core/util:gpr_test_util",
     ],
 )
diff --git a/test/core/util/BUILD b/test/core/util/BUILD
index be3e204777..f52570cde5 100644
--- a/test/core/util/BUILD
+++ b/test/core/util/BUILD
@@ -32,11 +32,6 @@ grpc_cc_library(
         "test_config.h",
     ],
     deps = ["//:gpr"],
-    data = [
-        "//tools:lsan_suppressions.txt",
-        "//tools:tsan_suppressions.txt",
-        "//tools:ubsan_suppressions.txt",
-    ],
 )
 
 grpc_cc_library(
diff --git a/test/cpp/client/BUILD b/test/cpp/client/BUILD
index c03ea92d34..12825e88c2 100644
--- a/test/cpp/client/BUILD
+++ b/test/cpp/client/BUILD
@@ -28,7 +28,6 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
index d51a0e3dc5..5dcfd94ed3 100644
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@@ -24,7 +24,6 @@ grpc_cc_test(
     external_deps = [
         "benchmark",
     ],
-    deps = ["//test/core/util:gpr_test_util",]
 )
 
 grpc_cc_library(
diff --git a/test/cpp/util/BUILD b/test/cpp/util/BUILD
index 9b42bb28b1..b1153d2df3 100644
--- a/test/cpp/util/BUILD
+++ b/test/cpp/util/BUILD
@@ -217,7 +217,6 @@ grpc_cc_test(
     ],
     deps = [
         "//:grpc++",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -261,7 +260,6 @@ grpc_cc_test(
     deps = [
         "//:grpc++_error_details",
         "//src/proto/grpc/testing:echo_messages_proto",
-        "//test/core/util:gpr_test_util",
     ],
 )
 
diff --git a/tools/BUILD b/tools/BUILD
deleted file mode 100644
index e0f2a80bb4..0000000000
--- a/tools/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-exports_files([
-    "lsan_suppressions.txt",
-    "tsan_suppressions.txt",
-    "ubsan_suppressions.txt",
-])
diff --git a/tools/internal_ci/linux/grpc_tsan_on_foundry.sh b/tools/internal_ci/linux/grpc_tsan_on_foundry.sh
index cd4e354be6..fafa1ceecb 100644
--- a/tools/internal_ci/linux/grpc_tsan_on_foundry.sh
+++ b/tools/internal_ci/linux/grpc_tsan_on_foundry.sh
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 export UPLOAD_TEST_RESULTS=true
-EXTRA_FLAGS="--copt=-gmlt --strip=never --copt=-fsanitize=thread --linkopt=-fsanitize=thread --test_timeout=3600 --action_env=TSAN_OPTIONS=suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
+EXTRA_FLAGS="--copt=-gmlt --strip=never --copt=-fsanitize=thread --linkopt=-fsanitize=thread --test_timeout=3600"
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"