From c3b9b4fb21ae324694c7e8ba53ee1ac3155adae9 Mon Sep 17 00:00:00 2001
From: esorot <theodorerose@google.com>
Date: Thu, 18 Jul 2024 15:43:06 +0000
Subject: [PATCH] backport staleness changes to 25.x

---
 regenerate_stale_files.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/regenerate_stale_files.sh b/regenerate_stale_files.sh
index c96693ac10..e240994fda 100755
--- a/regenerate_stale_files.sh
+++ b/regenerate_stale_files.sh
@@ -12,18 +12,28 @@ cd $(dirname -- "$0")
 
 readonly BazelBin="${BAZEL:-bazel} ${BAZEL_STARTUP_FLAGS}"
 
+STALENESS_TESTS=(
+  "java/core:generated_java_defaults_staleness_test"
+  "upb/reflection:bootstrap_upb_defaults_staleness_test"
+  "src:cmake_lists_staleness_test"
+  "src/google/protobuf:well_known_types_staleness_test"
+  "objectivec:well_known_types_staleness_test"
+  "php:test_amalgamation_staleness"
+  "ruby/ext/google/protobuf_c:test_amalgamation_staleness"
+  "upb/cmake:test_generated_files"
+  "upb/reflection:descriptor_upb_proto_staleness_test"
+  "upb_generator:plugin_upb_proto_staleness_test"
+)
+
 # Run and fix all staleness tests.
-${BazelBin} test src:cmake_lists_staleness_test "$@" || ./bazel-bin/src/cmake_lists_staleness_test --fix
-${BazelBin} test src/google/protobuf:well_known_types_staleness_test "$@" || ./bazel-bin/src/google/protobuf/well_known_types_staleness_test --fix
-${BazelBin} test objectivec:well_known_types_staleness_test "$@" || ./bazel-bin/objectivec/well_known_types_staleness_test --fix
-${BazelBin} test php:test_amalgamation_staleness "$@" || ./bazel-bin/php/test_amalgamation_staleness --fix
-${BazelBin} test ruby/ext/google/protobuf_c:test_amalgamation_staleness "$@" || ./bazel-bin/ruby/ext/google/protobuf_c/test_amalgamation_staleness --fix
-${BazelBin} test upb/cmake:test_generated_files "$@" || ./bazel-bin/upb/cmake/test_generated_files --fix
+for test in ${STALENESS_TESTS[@]}; do
+  ${BazelBin} test $test "$@" || ./bazel-bin/${test%%:*}/${test#*:} --fix
+done
 
 # Generate C# code.
 # This doesn't currently have Bazel staleness tests, but there's an existing
 # shell script that generates everything required. The output files are stable,
-# so just regenerating in place should be harmless. 
+# so just regenerating in place should be harmless.
 ${BazelBin} build src/google/protobuf/compiler:protoc "$@"
 (export PROTOC=$PWD/bazel-bin/protoc && cd csharp && ./generate_protos.sh)