From e469545eec950eb4662640fb9f4eacd4d4402e45 Mon Sep 17 00:00:00 2001
From: Richard Smith <richard@metafoo.co.uk>
Date: Tue, 3 Oct 2023 11:56:25 -0700
Subject: [PATCH] Make autoupdate leave blaze-bin alone and produce less spam.
 (#3259)

Minor changes to the blaze command line executed by our autoupdate
scripts:

- Don't change the convenience symlinks. Running autoupdate shouldn't
cause `./bazel-bin/...` to switch to running a different binary.
- Don't produce so much spam. Bazel will still log its build progress if
necessary, and still report compile and runtime errors, but won't
produce half a dozen lines of INFO at the start of the command.
---
 explorer/autoupdate_testdata.sh          | 6 ++++--
 testing/file_test/autoupdate_testdata.sh | 4 +++-
 toolchain/autoupdate_testdata.py         | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/explorer/autoupdate_testdata.sh b/explorer/autoupdate_testdata.sh
index 994b15d7f3a2..b6cdce8e0f43 100755
--- a/explorer/autoupdate_testdata.sh
+++ b/explorer/autoupdate_testdata.sh
@@ -4,5 +4,7 @@
 # Exceptions. See /LICENSE for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-bazel run -c opt --test_sharding_strategy=disabled //explorer:file_test \
-  -- --autoupdate
+bazel run -c opt --experimental_convenience_symlinks=ignore \
+  --ui_event_filters=-info,-stdout,-stderr,-finish \
+  --test_sharding_strategy=disabled \
+  //explorer:file_test -- --autoupdate
diff --git a/testing/file_test/autoupdate_testdata.sh b/testing/file_test/autoupdate_testdata.sh
index cbf3312de1ff..c258c803dc63 100755
--- a/testing/file_test/autoupdate_testdata.sh
+++ b/testing/file_test/autoupdate_testdata.sh
@@ -4,4 +4,6 @@
 # Exceptions. See /LICENSE for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-bazel run -c opt //testing/file_test:file_test_base_test -- --autoupdate "$@"
+bazel run -c opt --experimental_convenience_symlinks=ignore \
+  --ui_event_filters=-info,-stdout,-stderr,-finish \
+  //testing/file_test:file_test_base_test -- --autoupdate "$@"
diff --git a/toolchain/autoupdate_testdata.py b/toolchain/autoupdate_testdata.py
index 6e0b20173b94..ce3e288fbadd 100755
--- a/toolchain/autoupdate_testdata.py
+++ b/toolchain/autoupdate_testdata.py
@@ -19,6 +19,8 @@ def main() -> None:
         "run",
         "-c",
         "opt",
+        "--experimental_convenience_symlinks=ignore",
+        "--ui_event_filters=-info,-stdout,-stderr,-finish",
         "//toolchain/testing:file_test",
         "--",
         "--autoupdate",