commit 57a884680294924c487c35cdfeb24787fac8e94a
author Adam Cozzette <acozzette@google.com> Fri Nov 04 14:38:11 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Nov 04 14:39:26 2022 -0700
tree 48e70704c7095df464b935363feca1f2e03e462d
parent 155c8c183dc02be13e87018c2946f9581dd65adc

Make CMake test_util and lite_test_util mutually exclusive

This sets up these targets to be consistent with how the full and lite test
protos are currently handled.

PiperOrigin-RevId: 486233655

cmake/tests.cmake

diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index 57d4174..d3a0517 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -80,6 +80,7 @@
 
 set(common_test_files
   ${test_util_hdrs}
+  ${lite_test_util_srcs}
   ${test_util_srcs}
   ${common_test_hdrs}
   ${common_test_srcs}

pkg/BUILD.bazel

diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
index c403b5e..934e785 100644
--- a/pkg/BUILD.bazel
+++ b/pkg/BUILD.bazel
@@ -414,6 +414,7 @@
     ],
     dist_deps = [
       ":common_test",
+      ":lite_test_util",
       ":protoc",
       ":protobuf",
       ":protobuf_lite",

src/file_lists.cmake

diff --git a/src/file_lists.cmake b/src/file_lists.cmake
index a78511d..1e326bc 100644
--- a/src/file_lists.cmake
+++ b/src/file_lists.cmake
@@ -554,32 +554,23 @@
 
 # //pkg:test_util
 set(test_util_srcs
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_tester.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.cc
 )
 
 # //pkg:test_util
 set(test_util_hdrs
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test.inc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test_util.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test_util_impl.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/message_unittest.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_lite_unittest.inc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_tester.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util2.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.inc
 )