various bazelrc improvements

4 files changed, 9 insertions, 20 deletions

diff --git a/tools/remote_build/README.md b/tools/remote_build/README.md
index 7492de75a5..c4d03547a2 100644
--- a/tools/remote_build/README.md
+++ b/tools/remote_build/README.md
@@ -28,3 +28,6 @@ Sanitizer runs (asan, msan, tsan, ubsan):
 # manual run of bazel tests remotely on Foundry with given sanitizer
 bazel --bazelrc=tools/remote_build/manual.bazelrc test --config=asan //test/...
 ```
+
+Available command line options can be found in
+[Bazel command line reference](https://docs.bazel.build/versions/master/command-line-reference.html)
diff --git a/tools/remote_build/kokoro.bazelrc b/tools/remote_build/kokoro.bazelrc
index b06fb83d11..11462bd301 100644
--- a/tools/remote_build/kokoro.bazelrc
+++ b/tools/remote_build/kokoro.bazelrc
@@ -36,5 +36,3 @@ build --test_env=USER=anon
 build --jobs=200
 build --test_output=errors
 build --keep_going=true
-build --remote_accept_cached=true
-build --remote_local_fallback=true
diff --git a/tools/remote_build/manual.bazelrc b/tools/remote_build/manual.bazelrc
index d67bafedf3..b4fdc70637 100644
--- a/tools/remote_build/manual.bazelrc
+++ b/tools/remote_build/manual.bazelrc
@@ -40,3 +40,6 @@ build --jobs=100
 # TODO(jtattermusch): this should be part of the common config
 # but currently sanitizers use different test_timeout values
 build --test_timeout=300,450,1200,3600
+
+# print output for tests that fail (default is "summary")
+build --test_output=errors
diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc
index 9db867948f..e8c7f0b9cb 100644
--- a/tools/remote_build/rbe_common.bazelrc
+++ b/tools/remote_build/rbe_common.bazelrc
@@ -49,12 +49,6 @@ build:asan --copt=-gmlt
 # TODO(jtattermusch): use more reasonable test timeout
 build:asan --test_timeout=3600
 build:asan --test_tag_filters=-qps_json_driver,-json_run_localhost
-# TODO: revisit these from bazel.rc:
-#build:asan --copt=-O0
-#build:asan --copt=-fno-omit-frame-pointer
-#build:asan --copt=-DGPR_NO_DIRECT_SYSCALLS
-#build:asan --action_env=ASAN_OPTIONS=detect_leaks=1:color=always
-#build:asan --action_env=LSAN_OPTIONS=suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
 
 # memory sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
@@ -62,7 +56,7 @@ build:msan --copt=-gmlt
 # TODO(jtattermusch): use more reasonable test timeout
 build:msan --test_timeout=3600
 build:msan --cxxopt=--stdlib=libc++
-# TODO(jtattermusch): setting LD_LIBRARY_PATH is necessary
+# setting LD_LIBRARY_PATH is necessary
 # to avoid "libc++.so.1: cannot open shared object file"
 build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib
 build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default:toolchain
@@ -75,23 +69,14 @@ build:tsan --copt=-gmlt
 # TODO(jtattermusch): use more reasonable test timeout
 build:tsan --test_timeout=3600
 build:tsan --test_tag_filters=-qps_json_driver,-json_run_localhost
-# TODO: revisit these from bazel.rc:
-#build:tsan --copt=-fno-omit-frame-pointer
-#build:tsan --copt=-DGPR_NO_DIRECT_SYSCALLS
-#build:tsan --copt=-DGRPC_TSAN
 
 # undefined behavior sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
 build:ubsan --copt=-gmlt
 # TODO(jtattermusch): use more reasonable test timeout
 build:ubsan --test_timeout=3600
-# TODO: revisit these from bazel.rc:
-#build:ubsan --copt=-fno-omit-frame-pointer
-#build:ubsan --copt=-DGRPC_UBSAN
-#build:ubsan --copt=-DNDEBUG
-#build:ubsan --copt=-fno-sanitize=function,vptr
-# TODO: revisit this from grpc_ubsan_on_foundry.sh:
-#--crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.0/bazel_0.15.0/ubsan:toolchain
+# override the config-agnostic crosstool_top
+--crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.0/bazel_0.16.1/ubsan:toolchain
 # TODO(jtattermusch): remove this once Foundry adds the env to the docker image.
 # ubsan needs symbolizer to work properly, otherwise the suppression file doesn't work
 # and we get test failures.