Switch C++ test protos to use the normal cc_proto_library rules. (#9950)

pull/9951/head
David L. Jones 3 years ago committed by GitHub
parent 87c5475687
commit b64cd5ac64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 59
      BUILD.bazel
  2. 22
      java/core/BUILD.bazel
  3. 2
      java/kotlin-lite/BUILD.bazel
  4. 2
      java/kotlin/BUILD.bazel
  5. 1
      java/lite/BUILD.bazel

@ -1,7 +1,7 @@
# Bazel (https://bazel.build/) BUILD file for Protobuf.
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library","cc_test")
load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
load("@rules_python//python:defs.bzl", "py_library")
@ -10,7 +10,6 @@ load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS")
load(
":protobuf.bzl",
"adapt_proto_library",
"cc_proto_library",
"internal_copied_filegroup",
"internal_protobuf_py_tests",
"py_proto_library",
@ -468,6 +467,26 @@ RELATIVE_LITE_TEST_PROTOS = [
LITE_TEST_PROTOS = ["src/" + s for s in RELATIVE_LITE_TEST_PROTOS]
proto_library(
name = "lite_test_protos",
srcs = LITE_TEST_PROTOS,
strip_import_prefix = "src",
visibility = ["//:__subpackages__"],
deps = [
"//:any_proto",
"//:api_proto",
"//:descriptor_proto",
"//:duration_proto",
"//:empty_proto",
"//:field_mask_proto",
"//:source_context_proto",
"//:struct_proto",
"//:timestamp_proto",
"//:type_proto",
"//:wrappers_proto",
],
)
RELATIVE_TEST_PROTOS = [
# AUTOGEN(test_protos)
"google/protobuf/any_test.proto",
@ -519,6 +538,26 @@ RELATIVE_TEST_PROTOS = [
TEST_PROTOS = ["src/" + s for s in RELATIVE_TEST_PROTOS]
proto_library(
name = "test_protos",
srcs = TEST_PROTOS,
strip_import_prefix = "src",
visibility = ["//:__subpackages__"],
deps = [
"//:any_proto",
"//:api_proto",
"//:descriptor_proto",
"//:duration_proto",
"//:empty_proto",
"//:field_mask_proto",
"//:source_context_proto",
"//:struct_proto",
"//:timestamp_proto",
"//:type_proto",
"//:wrappers_proto",
],
)
GENERIC_RELATIVE_TEST_PROTOS = [
"google/protobuf/map_proto2_unittest.proto",
"google/protobuf/map_unittest.proto",
@ -550,11 +589,9 @@ GENERIC_RELATIVE_TEST_PROTOS = [
"google/protobuf/unittest_well_known_types.proto",
]
GENERIC_TEST_PROTOS = ["src/" + s for s in GENERIC_RELATIVE_TEST_PROTOS]
proto_library(
name = "generic_test_protos",
srcs = LITE_TEST_PROTOS + GENERIC_TEST_PROTOS,
srcs = ["src/" + s for s in GENERIC_RELATIVE_TEST_PROTOS],
strip_import_prefix = "src",
visibility = ["//:__subpackages__"],
deps = [
@ -572,13 +609,14 @@ proto_library(
],
)
cc_proto_library(
name = "cc_lite_test_protos",
deps = [":lite_test_protos"],
)
cc_proto_library(
name = "cc_test_protos",
srcs = LITE_TEST_PROTOS + TEST_PROTOS,
include = "src",
default_runtime = ":protobuf",
protoc = ":protoc",
deps = [":cc_wkt_protos"],
deps = [":test_protos"],
)
COMMON_TEST_SRCS = [
@ -731,6 +769,7 @@ cc_test(
],
linkopts = LINK_OPTS,
deps = [
":cc_lite_test_protos",
":cc_test_protos",
":protobuf",
":protoc_lib",

@ -243,6 +243,7 @@ proto_library(
"//:any_proto",
"//:descriptor_proto",
"//:generic_test_protos",
"//:lite_test_protos",
"//:wrappers_proto",
],
)
@ -255,6 +256,14 @@ java_proto_library(
deps = ["//:generic_test_protos"],
)
java_proto_library(
name = "lite_test_protos_java_proto",
visibility = [
"//java:__subpackages__",
],
deps = ["//:lite_test_protos"],
)
java_proto_library(
name = "java_test_protos_java_proto",
deps = [":java_test_protos"],
@ -270,6 +279,7 @@ java_library(
deps = [
":core",
":generic_test_protos_java_proto",
":lite_test_protos_java_proto",
":java_test_protos_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:junit_junit",
@ -316,6 +326,7 @@ junit_tests(
deps = [
":core",
":generic_test_protos_java_proto",
":lite_test_protos_java_proto",
":java_test_protos_java_proto",
":test_util",
"@maven//:com_google_guava_guava",
@ -352,6 +363,15 @@ java_lite_proto_library(
deps = ["//:generic_test_protos"],
)
java_lite_proto_library(
name = "lite_test_protos_java_proto_lite",
visibility = [
"//java/kotlin-lite:__pkg__",
"//java/lite:__pkg__",
],
deps = ["//:lite_test_protos"],
)
java_lite_proto_library(
name = "java_test_protos_java_proto_lite",
visibility = [
@ -382,6 +402,7 @@ java_library(
],
deps = [
":generic_test_protos_java_proto_lite",
":lite_test_protos_java_proto_lite",
":java_test_protos_java_proto_lite",
":lite_runtime_only",
"@maven//:com_google_guava_guava",
@ -444,6 +465,7 @@ junit_tests(
test_prefix = "Lite",
deps = [
":generic_test_protos_java_proto_lite",
":lite_test_protos_java_proto_lite",
":java_test_protos_java_proto_lite",
":lite",
":test_util_lite",

@ -152,6 +152,7 @@ kt_jvm_library(
deps = [
":evil_names_proto2_java_proto_lite",
"//java/core:generic_test_protos_java_proto_lite",
"//java/core:lite_test_protos_java_proto_lite",
"//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
"//java/kotlin:shared_runtime",
"//java/lite",
@ -175,6 +176,7 @@ kt_jvm_library(
":evil_names_proto3_java_proto_lite",
":multiple_files_proto3_java_proto_lite",
"//java/core:generic_test_protos_java_proto_lite",
"//java/core:lite_test_protos_java_proto_lite",
"//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
"//java/kotlin:shared_runtime",
"//java/lite",

@ -240,6 +240,7 @@ kt_jvm_library(
":well_known_protos_kotlin",
"//java/core",
"//java/core:generic_test_protos_java_proto",
"//java/core:lite_test_protos_java_proto",
],
)
@ -262,6 +263,7 @@ kt_jvm_library(
":shared_runtime",
"//java/core",
"//java/core:generic_test_protos_java_proto",
"//java/core:lite_test_protos_java_proto",
],
)

@ -71,6 +71,7 @@ junit_tests(
deps = [
":lite",
"//java/core:generic_test_protos_java_proto_lite",
"//java/core:lite_test_protos_java_proto_lite",
"//java/core:java_test_protos_java_proto_lite",
"//java/core:test_util_lite",
"@maven//:com_google_truth_truth",

Loading…
Cancel
Save