Merge pull request #15645 from adelez/foundry_integration

Add suppressions to sanitizers for bazel builds

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):
+                    alwayslink = 0, data = []):
   copts = []
   if language.upper() == "C":
     copts = if_not_windows(["-std=c99"])
@@ -87,6 +87,7 @@ def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
         "include"
     ],
     alwayslink = alwayslink,
+    data = data,
   )
 
 def grpc_proto_plugin(name, srcs = [], deps = []):

test/core/channel/BUILD

@@ -105,6 +105,7 @@ grpc_cc_test(
     language = "C++",
     deps = [
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
     external_deps = [
         "gtest",

test/core/security/BUILD

@@ -183,6 +183,7 @@ grpc_cc_test(
         "//:gpr",
         "//:gpr_base",
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -195,6 +196,7 @@ grpc_cc_test(
         "//:gpr",
         "//:gpr_base",
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -206,6 +208,7 @@ grpc_cc_test(
         "//:alts_util",
         "//:gpr",
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -220,5 +223,6 @@ grpc_cc_test(
         "//:grpc_secure",
         "//:tsi", 
         "//:tsi_interface",
+        "//test/core/util:gpr_test_util",
     ],
 )

test/core/transport/BUILD

@@ -129,6 +129,7 @@ grpc_cc_test(
     language = "C++",
     deps = [
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
     external_deps = [
         "gtest",

test/core/tsi/alts/crypt/BUILD

@@ -27,6 +27,7 @@ grpc_cc_test(
         "//:alts_frame_protector",
         "//:gpr",
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
 )
 

test/core/tsi/alts/frame_protector/BUILD

@@ -27,6 +27,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -39,6 +40,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -54,6 +56,7 @@ 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",
     ],
 )
 
@@ -67,5 +70,6 @@ grpc_cc_test(
         "//:gpr_base",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
+        "//test/core/util:gpr_test_util",
     ],
 )

test/core/tsi/alts/handshaker/BUILD

@@ -37,6 +37,7 @@ grpc_cc_test(
         "//:tsi",
         "//:tsi_interface",
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -47,6 +48,7 @@ grpc_cc_test(
     deps = [
         ":alts_handshaker_service_api_test_lib",
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -60,6 +62,7 @@ grpc_cc_test(
         "//:gpr_base",
         "//:grpc",
         "//:tsi",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -71,6 +74,7 @@ grpc_cc_test(
         ":alts_handshaker_service_api_test_lib",
         "//:grpc",
         "//:tsi",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -81,6 +85,7 @@ grpc_cc_test(
     deps = [
         "//:alts_util",
         "//:grpc",
+        "//test/core/util:gpr_test_util",
     ],
 )
 

test/core/tsi/alts/zero_copy_frame_protector/BUILD

@@ -28,6 +28,7 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc_base_c",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -40,6 +41,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -53,5 +55,6 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc_base_c",
         "//test/core/tsi/alts/crypt:alts_crypt_test_util",
+        "//test/core/util:gpr_test_util",
     ],
 )

test/core/util/BUILD

@@ -32,6 +32,11 @@ grpc_cc_library(
         "test_config.h",
     ],
     deps = ["//:gpr"],
+    data = [
+        "//tools:lsan_suppressions.txt",
+        "//tools:tsan_suppressions.txt",
+        "//tools:ubsan_suppressions.txt",
+    ],
 )
 
 grpc_cc_library(

test/cpp/client/BUILD

@@ -28,6 +28,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//test/core/util:gpr_test_util",
     ],
 )
 

test/cpp/microbenchmarks/BUILD

@@ -24,6 +24,7 @@ grpc_cc_test(
     external_deps = [
         "benchmark",
     ],
+    deps = ["//test/core/util:gpr_test_util",]
 )
 
 grpc_cc_library(

test/cpp/util/BUILD

@@ -217,6 +217,7 @@ grpc_cc_test(
     ],
     deps = [
         "//:grpc++",
+        "//test/core/util:gpr_test_util",
     ],
 )
 
@@ -260,6 +261,7 @@ grpc_cc_test(
     deps = [
         "//:grpc++_error_details",
         "//src/proto/grpc/testing:echo_messages_proto",
+        "//test/core/util:gpr_test_util",
     ],
 )
 

tools/BUILD

@@ -0,0 +1,19 @@
+# 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",
+])

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"
+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"
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"