@@ -917,7 +917,45 @@ filegroup(
917917
918918proto_library (
919919 name = "test_protos" ,
920- srcs = [":test_proto_all_srcs" ],
920+ srcs = [
921+ "any_test.proto" ,
922+ "edition_unittest.proto" ,
923+ "map_proto2_unittest.proto" ,
924+ "map_proto3_unittest.proto" ,
925+ "map_unittest.proto" ,
926+ "unittest.proto" ,
927+ "unittest_arena.proto" ,
928+ "unittest_custom_options.proto" ,
929+ "unittest_delimited.proto" ,
930+ "unittest_delimited_import.proto" ,
931+ "unittest_drop_unknown_fields.proto" ,
932+ "unittest_embed_optimize_for.proto" ,
933+ "unittest_empty.proto" ,
934+ "unittest_enormous_descriptor.proto" ,
935+ "unittest_features.proto" ,
936+ "unittest_import.proto" ,
937+ "unittest_import_public.proto" ,
938+ "unittest_invalid_features.proto" ,
939+ "unittest_lazy_dependencies.proto" ,
940+ "unittest_lazy_dependencies_custom_option.proto" ,
941+ "unittest_lazy_dependencies_enum.proto" ,
942+ "unittest_legacy_features.proto" ,
943+ "unittest_lite_imports_nonlite.proto" ,
944+ "unittest_mset.proto" ,
945+ "unittest_mset_wire_format.proto" ,
946+ "unittest_no_field_presence.proto" ,
947+ "unittest_no_generic_services.proto" ,
948+ "unittest_optimize_for.proto" ,
949+ "unittest_preserve_unknown_enum.proto" ,
950+ "unittest_preserve_unknown_enum2.proto" ,
951+ "unittest_proto3_bad_macros.proto" ,
952+ "unittest_proto3_extensions.proto" ,
953+ "unittest_proto3_lite.proto" ,
954+ "unittest_retention.proto" ,
955+ "unittest_string_type.proto" ,
956+ "unittest_string_view.proto" ,
957+ "unittest_well_known_types.proto" ,
958+ ],
921959 strip_import_prefix = "/src" ,
922960 visibility = ["//:__subpackages__" ],
923961 deps = [
@@ -936,6 +974,67 @@ proto_library(
936974 ],
937975)
938976
977+ proto_library (
978+ name = "unittest_proto3_arena_proto" ,
979+ srcs = ["unittest_proto3_arena.proto" ],
980+ strip_import_prefix = "/src" ,
981+ deps = [
982+ ":descriptor_proto" ,
983+ ":test_protos" ,
984+ ],
985+ )
986+
987+ cc_proto_library (
988+ name = "unittest_proto3_arena_cc_proto" ,
989+ visibility = ["//:__subpackages__" ],
990+ deps = [":unittest_proto3_arena_proto" ],
991+ )
992+
993+ proto_library (
994+ name = "unittest_proto3_arena_lite_proto" ,
995+ srcs = ["unittest_proto3_arena_lite.proto" ],
996+ strip_import_prefix = "/src" ,
997+ deps = [
998+ ":descriptor_proto" ,
999+ ":test_protos" ,
1000+ ],
1001+ )
1002+
1003+ cc_proto_library (
1004+ name = "unittest_proto3_arena_lite_cc_proto" ,
1005+ visibility = ["//:__subpackages__" ],
1006+ deps = [":unittest_proto3_arena_lite_proto" ],
1007+ )
1008+
1009+ proto_library (
1010+ name = "unittest_proto3_proto" ,
1011+ srcs = ["unittest_proto3.proto" ],
1012+ strip_import_prefix = "/src" ,
1013+ deps = [
1014+ ":descriptor_proto" ,
1015+ ":test_protos" ,
1016+ ],
1017+ )
1018+
1019+ cc_proto_library (
1020+ name = "unittest_proto3_cc_proto" ,
1021+ visibility = ["//:__subpackages__" ],
1022+ deps = [":unittest_proto3_proto" ],
1023+ )
1024+
1025+ proto_library (
1026+ name = "unittest_proto3_optional_proto" ,
1027+ srcs = ["unittest_proto3_optional.proto" ],
1028+ strip_import_prefix = "/src" ,
1029+ deps = [":descriptor_proto" ],
1030+ )
1031+
1032+ cc_proto_library (
1033+ name = "unittest_proto3_optional_cc_proto" ,
1034+ visibility = ["//:__subpackages__" ],
1035+ deps = [":unittest_proto3_optional_proto" ],
1036+ )
1037+
9391038proto_library (
9401039 name = "unittest_features_proto" ,
9411040 srcs = ["unittest_features.proto" ],
@@ -1309,6 +1408,7 @@ cc_test(
13091408 ":port" ,
13101409 ":protobuf" ,
13111410 ":test_textproto" ,
1411+ ":unittest_proto3_arena_cc_proto" ,
13121412 "//src/google/protobuf/compiler:importer" ,
13131413 "//src/google/protobuf/io" ,
13141414 "//src/google/protobuf/io:tokenizer" ,
@@ -1457,6 +1557,7 @@ cc_test(
14571557 ":port" ,
14581558 ":protobuf" ,
14591559 ":test_util" ,
1560+ ":unittest_proto3_cc_proto" ,
14601561 "//src/google/protobuf/stubs" ,
14611562 "//src/google/protobuf/testing" ,
14621563 "//src/google/protobuf/testing:file" ,
@@ -1706,6 +1807,8 @@ cc_test(
17061807 ":arena" ,
17071808 ":cc_test_protos" ,
17081809 ":protobuf" ,
1810+ # TODO: This should test against :unittest_proto3_arena_lite_cc_proto instead.
1811+ ":unittest_proto3_arena_cc_proto" ,
17091812 "//src/google/protobuf/testing" ,
17101813 "//src/google/protobuf/testing:file" ,
17111814 "@com_google_googletest//:gtest" ,
@@ -1728,6 +1831,8 @@ cc_test(
17281831 ":port" ,
17291832 ":protobuf" ,
17301833 ":test_util" ,
1834+ ":unittest_proto3_arena_cc_proto" ,
1835+ ":unittest_proto3_optional_cc_proto" ,
17311836 "//src/google/protobuf/stubs" ,
17321837 "//src/google/protobuf/testing" ,
17331838 "//src/google/protobuf/testing:file" ,
@@ -1755,6 +1860,7 @@ cc_test(
17551860 ":cc_test_protos" ,
17561861 ":lite_test_util" ,
17571862 ":protobuf" ,
1863+ ":unittest_proto3_cc_proto" ,
17581864 "//src/google/protobuf/testing" ,
17591865 "//src/google/protobuf/testing:file" ,
17601866 "@com_google_googletest//:gtest" ,
@@ -1857,6 +1963,7 @@ cc_test(
18571963 ":protobuf" ,
18581964 ":test_util" ,
18591965 ":test_util2" ,
1966+ ":unittest_proto3_cc_proto" ,
18601967 "//src/google/protobuf/io" ,
18611968 "//src/google/protobuf/io:tokenizer" ,
18621969 "//src/google/protobuf/stubs" ,
@@ -1936,6 +2043,7 @@ cc_test(
19362043 ":protobuf_lite" ,
19372044 ":test_util" ,
19382045 ":test_util2" ,
2046+ ":unittest_proto3_arena_cc_proto" ,
19392047 "//src/google/protobuf/io" ,
19402048 "//src/google/protobuf/stubs" ,
19412049 "//src/google/protobuf/testing" ,
0 commit comments