|
@@ -14,38 +14,6 @@ exports_files(["LICENSE"])
|
|
# build configuration
|
|
# build configuration
|
|
################################################################################
|
|
################################################################################
|
|
|
|
|
|
-# TODO(yannic): Remove in 3.14.0.
|
|
|
|
-string_flag(
|
|
|
|
- name = "incompatible_use_com_google_googletest",
|
|
|
|
- build_setting_default = "true",
|
|
|
|
- values = ["true", "false"]
|
|
|
|
-)
|
|
|
|
-
|
|
|
|
-config_setting(
|
|
|
|
- name = "use_com_google_googletest",
|
|
|
|
- flag_values = {
|
|
|
|
- "//:incompatible_use_com_google_googletest": "true"
|
|
|
|
- },
|
|
|
|
-)
|
|
|
|
-
|
|
|
|
-GTEST = select({
|
|
|
|
- "//:use_com_google_googletest": [
|
|
|
|
- "@com_google_googletest//:gtest",
|
|
|
|
- ],
|
|
|
|
- "//conditions:default": [
|
|
|
|
- "//external:gtest",
|
|
|
|
- ],
|
|
|
|
-})
|
|
|
|
-
|
|
|
|
-GTEST_MAIN = select({
|
|
|
|
- "//:use_com_google_googletest": [
|
|
|
|
- "@com_google_googletest//:gtest_main",
|
|
|
|
- ],
|
|
|
|
- "//conditions:default": [
|
|
|
|
- "//external:gtest_main",
|
|
|
|
- ],
|
|
|
|
-})
|
|
|
|
-
|
|
|
|
################################################################################
|
|
################################################################################
|
|
# ZLIB configuration
|
|
# ZLIB configuration
|
|
################################################################################
|
|
################################################################################
|
|
@@ -571,6 +539,7 @@ COMMON_TEST_SRCS = [
|
|
|
|
|
|
cc_binary(
|
|
cc_binary(
|
|
name = "test_plugin",
|
|
name = "test_plugin",
|
|
|
|
+ testonly = True,
|
|
srcs = [
|
|
srcs = [
|
|
# AUTOGEN(test_plugin_srcs)
|
|
# AUTOGEN(test_plugin_srcs)
|
|
"src/google/protobuf/compiler/mock_code_generator.cc",
|
|
"src/google/protobuf/compiler/mock_code_generator.cc",
|
|
@@ -580,7 +549,8 @@ cc_binary(
|
|
deps = [
|
|
deps = [
|
|
":protobuf",
|
|
":protobuf",
|
|
":protoc_lib",
|
|
":protoc_lib",
|
|
- ] + GTEST,
|
|
|
|
|
|
+ "@com_google_googletest//:gtest",
|
|
|
|
+ ],
|
|
)
|
|
)
|
|
|
|
|
|
cc_test(
|
|
cc_test(
|
|
@@ -592,7 +562,9 @@ cc_test(
|
|
],
|
|
],
|
|
deps = [
|
|
deps = [
|
|
":protobuf_lite",
|
|
":protobuf_lite",
|
|
- ] + GTEST_MAIN,
|
|
|
|
|
|
+ "@com_google_googletest//:gtest",
|
|
|
|
+ "@com_google_googletest//:gtest_main",
|
|
|
|
+ ],
|
|
)
|
|
)
|
|
|
|
|
|
cc_test(
|
|
cc_test(
|
|
@@ -695,7 +667,9 @@ cc_test(
|
|
":cc_test_protos",
|
|
":cc_test_protos",
|
|
":protobuf",
|
|
":protobuf",
|
|
":protoc_lib",
|
|
":protoc_lib",
|
|
- ] + PROTOBUF_DEPS + GTEST_MAIN,
|
|
|
|
|
|
+ "@com_google_googletest//:gtest",
|
|
|
|
+ "@com_google_googletest//:gtest_main",
|
|
|
|
+ ] + PROTOBUF_DEPS,
|
|
)
|
|
)
|
|
|
|
|
|
################################################################################
|
|
################################################################################
|