From e5f9f5ef4605bec53ebd06b2d0ade0c77189d256 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 14 Nov 2018 16:40:35 +0100
Subject: [PATCH] disable grpc_tool_test on msan

---
 test/cpp/util/BUILD                   | 1 +
 tools/remote_build/rbe_common.bazelrc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cpp/util/BUILD b/test/cpp/util/BUILD
index c8d4333ef0d..57eaf3baf2f 100644
--- a/test/cpp/util/BUILD
+++ b/test/cpp/util/BUILD
@@ -185,6 +185,7 @@ grpc_cc_test(
     external_deps = [
         "gtest",
     ],
+    tags = ["nomsan"],  # death tests seem to be incompatible with msan
     deps = [
         ":grpc_cli_libs",
         ":test_util",
diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc
index fe61b30492a..75a42a317e8 100644
--- a/tools/remote_build/rbe_common.bazelrc
+++ b/tools/remote_build/rbe_common.bazelrc
@@ -56,7 +56,7 @@ build:msan --copt=-gmlt
 # TODO(jtattermusch): use more reasonable test timeout
 build:msan --test_timeout=3600
 # TODO(jtattermusch): revisit the disabled tests
-build:msan --test_tag_filters=-json_run_localhost
+build:msan --test_tag_filters=-nomsan,-json_run_localhost
 build:msan --cxxopt=--stdlib=libc++
 # setting LD_LIBRARY_PATH is necessary
 # to avoid "libc++.so.1: cannot open shared object file"