From 1a662aa18d6487bf69cf2c81c5bbbb133151835b Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Thu, 9 Sep 2021 12:21:44 -0700
Subject: [PATCH] Disabled build_files_updated unittest for now.

---
 BUILD                       | 34 ++++++++++++++++++----------------
 kokoro/linux/bazel/build.sh |  4 +++-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/BUILD b/BUILD
index 7de87f884f..e592465ea0 100644
--- a/BUILD
+++ b/BUILD
@@ -1203,22 +1203,24 @@ cc_binary(
     ],
 )
 
-sh_test(
-    name = "build_files_updated_unittest",
-    srcs = [
-        "build_files_updated_unittest.sh",
-    ],
-    data = [
-        "BUILD",
-        "cmake/extract_includes.bat.in",
-        "cmake/libprotobuf.cmake",
-        "cmake/libprotobuf-lite.cmake",
-        "cmake/libprotoc.cmake",
-        "cmake/tests.cmake",
-        "src/Makefile.am",
-        "update_file_lists.sh",
-    ],
-)
+# TODO: re-enable this test if appropriate, or replace with something that
+# uses the new setup.
+# sh_test(
+#     name = "build_files_updated_unittest",
+#     srcs = [
+#         "build_files_updated_unittest.sh",
+#     ],
+#     data = [
+#         "BUILD",
+#         "cmake/extract_includes.bat.in",
+#         "cmake/libprotobuf.cmake",
+#         "cmake/libprotobuf-lite.cmake",
+#         "cmake/libprotoc.cmake",
+#         "cmake/tests.cmake",
+#         "src/Makefile.am",
+#         "update_file_lists.sh",
+#     ],
+# )
 
 java_proto_library(
     name = "test_messages_proto2_java_proto",
diff --git a/kokoro/linux/bazel/build.sh b/kokoro/linux/bazel/build.sh
index 1b4fb8d10a..5ec92ce7e5 100755
--- a/kokoro/linux/bazel/build.sh
+++ b/kokoro/linux/bazel/build.sh
@@ -22,9 +22,11 @@ cd $(dirname $0)/../../..
 
 git submodule update --init --recursive
 
+#  Disabled for now, re-enable if appropriate.
+#  //:build_files_updated_unittest \
+
 trap print_test_logs EXIT
 bazel test -k --copt=-Werror --host_copt=-Werror \
-  //:build_files_updated_unittest \
   //java:tests \
   //:protoc \
   //:protobuf \