Move LazilyBuildDependenciesTest into its own .cc file and CMake test binary

One of the test cases involves observing the lazy loading behavior of the
generated descriptor pool. Since this pool is a global, it can be influenced by
other unrelated tests, and whether the test succeeds or fails depends on the
test ordering. Moving the test into its own binary ensures that it will pass
regardless of test ordering.

Fixes #21431.

PiperOrigin-RevId: 752313710

Author: Adam Cozzette

cmake/tests.cmake

@@ -175,6 +175,26 @@ add_test(NAME full-test
   COMMAND tests ${protobuf_GTEST_ARGS}
   WORKING_DIRECTORY ${protobuf_SOURCE_DIR})
 
+# This test involves observing and modifying the internal state of the global
+# descriptor pool, so it needs to be in its own binary to avoid conflicting
+# with other tests.
+add_executable(lazily-build-dependencies-test
+  ${lazily_build_dependencies_test_files}
+)
+
+target_link_libraries(lazily-build-dependencies-test
+  libtest_common
+  libtest_common_lite
+  ${protobuf_LIB_PROTOBUF}
+  ${protobuf_ABSL_USED_TARGETS}
+  ${protobuf_ABSL_USED_TEST_TARGETS}
+  GTest::gmock_main
+)
+
+add_test(NAME lazily-build-dependencies-test
+  COMMAND lazily-build-dependencies-test ${protobuf_GTEST_ARGS}
+  WORKING_DIRECTORY ${protobuf_SOURCE_DIR})
+
 if (protobuf_BUILD_LIBUPB)
   set(upb_test_proto_genfiles)
   foreach(proto_file ${upb_test_protos_files} ${descriptor_proto_proto_srcs})

pkg/BUILD.bazel

@@ -132,6 +132,7 @@ gen_file_lists(
         "//upb:test_protos": "upb_test_protos",
         "//upb:test_srcs": "upb_test",
         "//src/google/protobuf:full_test_srcs": "protobuf_test",
+        "//src/google/protobuf:lazily_build_dependencies_test_srcs": "lazily_build_dependencies_test",
         "//src/google/protobuf:test_proto_all_srcs": "protobuf_test_protos",
         "//src/google/protobuf:lite_test_srcs": "protobuf_lite_test",
         "//src/google/protobuf:lite_test_proto_srcs": "protobuf_lite_test_protos",

src/google/protobuf/BUILD.bazel

@@ -1568,6 +1568,30 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "lazily_build_dependencies_test",
+    srcs = ["lazily_build_dependencies_test.cc"],
+    copts = COPTS,
+    deps = [
+        ":any_cc_proto",
+        ":cc_test_protos",
+        ":descriptor_legacy",
+        ":port",
+        ":protobuf",
+        ":test_textproto",
+        ":unittest_proto3_arena_cc_proto",
+        "//src/google/protobuf/io",
+        "//src/google/protobuf/io:tokenizer",
+        "//src/google/protobuf/stubs",
+        "//src/google/protobuf/testing",
+        "//src/google/protobuf/testing:file",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 cc_library(
     name = "test_textproto",
     testonly = True,
@@ -2353,13 +2377,20 @@ filegroup(
             "*unittest.cc",
         ],
         exclude = [
+            "lazily_build_dependencies_test.cc",
             "lite_unittest.cc",
             "lite_arena_unittest.cc",
         ],
     ),
     visibility = ["//pkg:__pkg__"],
 )
 
+filegroup(
+    name = "lazily_build_dependencies_test_srcs",
+    srcs = ["lazily_build_dependencies_test.cc"],
+    visibility = ["//pkg:__pkg__"],
+)
+
 filegroup(
     name = "lite_test_srcs",
     srcs = [