Add protobuf loads to unit tests
This is needed to remove proto rules from Bazel. The automatic loading is disabled in unit tests.
PiperOrigin-RevId: 686069253
Change-Id: I8a2e5751ab98f24be1dc5e7854a57f68a06a6323
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockProtoSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockProtoSupport.java
index 7dc7f7d..bb89e7d 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockProtoSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockProtoSupport.java
@@ -48,7 +48,7 @@
config.append("MODULE.bazel", "register_toolchains('//tools/proto/toolchains:all')");
config.create(
"tools/proto/toolchains/BUILD",
- TestConstants.LOAD_PROTO_TOOLCHAIN,
+ "load('@protobuf//bazel/toolchains:proto_toolchain.bzl', 'proto_toolchain')",
TestConstants.LOAD_PROTO_LANG_TOOLCHAIN,
"proto_toolchain(name = 'protoc_sources',"
+ "proto_compiler = '"
@@ -289,7 +289,7 @@
""");
config.create(
"net/proto2/proto/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"package(default_visibility=['//visibility:public'])",
"genrule(name = 'go_internal_bootstrap_hack',",
" srcs = [ 'descriptor.pb.go-prebuilt' ],",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
index 81dff30..4f0c811 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
@@ -52,7 +52,7 @@
scratch.appendFile(
"third_party/protobuf/BUILD.bazel",
TestConstants.LOAD_PROTO_LANG_TOOLCHAIN,
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"package(default_visibility=['//visibility:public'])",
"proto_library(",
" name = 'any_proto',",
@@ -83,7 +83,8 @@
CppRuleClasses.SUPPORTS_INTERFACE_SHARED_LIBRARIES));
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
"proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
assertThat(prettyArtifactNames(getFilesToBuild(getConfiguredTarget("//x:foo_cc_proto"))))
@@ -107,7 +108,8 @@
CppRuleClasses.SUPPORTS_INTERFACE_SHARED_LIBRARIES));
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
"proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
assertThat(prettyArtifactNames(getFilesToBuild(getConfiguredTarget("//x:foo_cc_proto"))))
@@ -119,7 +121,8 @@
public void canBeUsedFromCcRules() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_library(name = 'foo', srcs = ['foo.cc'], deps = ['foo_cc_proto'])",
"cc_binary(name = 'bin', srcs = ['bin.cc'], deps = ['foo_cc_proto'])",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
@@ -139,7 +142,8 @@
"x",
"foo_cc_proto",
"'deps' attribute must contain exactly one label",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto', 'bar_proto'])",
"proto_library(name = 'foo_proto', srcs = ['foo.proto'])",
"proto_library(name = 'bar_proto', srcs = ['bar.proto'])");
@@ -148,6 +152,7 @@
"y",
"foo_cc_proto",
"'deps' attribute must contain exactly one label",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = [])");
}
@@ -155,7 +160,8 @@
public void aliasProtos() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['alias_proto'])",
"proto_library(name = 'alias_proto', deps = [':foo_proto'])",
"proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
@@ -170,7 +176,7 @@
public void blacklistedProtos() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'any_cc_proto', deps = ['@protobuf//:any_proto'])");
CcCompilationContext ccCompilationContext =
@@ -182,7 +188,8 @@
public void blacklistedProtosInTransitiveDeps() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
"proto_library(",
" name = 'foo_proto',",
@@ -200,7 +207,8 @@
public void ccCompilationContext() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
"proto_library(name = 'foo_proto', srcs = ['foo.proto'], deps = [':bar_proto'])",
"proto_library(name = 'bar_proto', srcs = ['bar.proto'])");
@@ -215,7 +223,8 @@
public void outputDirectoryForProtoCompileAction() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = [':bar_proto'])",
"proto_library(name = 'bar_proto', srcs = ['bar.proto'])");
@@ -235,13 +244,15 @@
setBuildLanguageOptions(
"--experimental_builtins_injection_override=+cc_proto_library", "--enable_workspace");
scratch.file(
- "x/BUILD", "cc_proto_library(name = 'foo_cc_proto', deps = ['@bla//foo:bar_proto'])");
+ "x/BUILD",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
+ "cc_proto_library(name = 'foo_cc_proto', deps = ['@bla//foo:bar_proto'])");
scratch.file("/bla/WORKSPACE");
// Create the rule '@bla//foo:bar_proto'.
scratch.file(
"/bla/foo/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"package(default_visibility=['//visibility:public'])",
"proto_library(name = 'bar_proto', srcs = ['bar.proto'])");
String existingWorkspace =
@@ -281,7 +292,8 @@
"--cc_proto_library_source_suffixes=.pb.cc,.pb.cc.meta");
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
"proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
@@ -297,7 +309,8 @@
useConfiguration("--collect_code_coverage", "--instrumentation_filter=.");
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
"proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
ConfiguredTarget target = getConfiguredTarget("//x:foo_cc_proto");
@@ -321,7 +334,8 @@
scratch.file("/yolo_repo/yolo_pkg/yolo.proto");
scratch.file(
"/yolo_repo/yolo_pkg/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"proto_library(",
" name = 'yolo_proto',",
" srcs = ['yolo.proto'],",
@@ -347,7 +361,8 @@
scratch.file("/yolo_repo/yolo_pkg/yolo.proto");
scratch.file(
"/yolo_repo/yolo_pkg/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"proto_library(",
" name = 'yolo_proto',",
" srcs = ['yolo.proto'],",
@@ -372,7 +387,8 @@
scratch.file("/yolo_repo/yolo_pkg/yolo.proto");
scratch.file(
"/yolo_repo/yolo_pkg/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"proto_library(",
" name = 'yolo_proto',",
" srcs = ['yolo.proto'],",
@@ -414,7 +430,8 @@
scratch.file(
"a/BUILD",
getAnalysisMock().ccSupport().getMacroLoadStatement(loadMacro, "cc_proto_library"),
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:cc_proto_library.bzl', 'cc_proto_library')",
"cc_proto_library(",
" name='a',",
" deps=[':a_p'],",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java
index c2a22f9..2f43b96 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java
@@ -82,15 +82,16 @@
scratch.appendFile(
"tools/proto/toolchains/BUILD",
"""
- package(default_visibility = ["//visibility:public"])
+load('@protobuf//bazel/toolchains:proto_lang_toolchain.bzl', 'proto_lang_toolchain')
+package(default_visibility = ["//visibility:public"])
- proto_lang_toolchain(
- name = "javalite",
- command_line = "--java_out=lite,immutable:$(OUT)",
- progress_message = "Generating JavaLite proto_library %{label}",
- runtime = "//protobuf:javalite_runtime",
- )
- """);
+proto_lang_toolchain(
+ name = "javalite",
+ command_line = "--java_out=lite,immutable:$(OUT)",
+ progress_message = "Generating JavaLite proto_library %{label}",
+ runtime = "//protobuf:javalite_runtime",
+)
+""");
}
private void mockRuntimes() throws IOException {
@@ -116,6 +117,8 @@
scratch.file(
"x/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
java_lite_proto_library(
name = "lite_pb2",
deps = [":foo"],
@@ -165,6 +168,8 @@
scratch.file(
"x/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
java_lite_proto_library(
name = "lite_pb2",
deps = [":protolib"],
@@ -199,6 +204,9 @@
scratchConfiguredTarget(
"java",
"lite_pb2",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:java_lite_proto_library.bzl',"
+ + " 'java_lite_proto_library')",
"java_lite_proto_library(name = 'lite_pb2', deps = [':compiled'])",
"proto_library(name = 'compiled',",
" srcs = [ 'ok.proto' ])");
@@ -217,6 +225,8 @@
scratch.file(
"java/lib/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
java_lite_proto_library(
name = "lite_pb2",
deps = [":proto"],
@@ -247,6 +257,9 @@
scratchConfiguredTarget(
"notbad",
"lite_pb2",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "load('@protobuf//bazel:java_lite_proto_library.bzl',"
+ + " 'java_lite_proto_library')",
"java_lite_proto_library(name = 'lite_pb2', deps = [':null_lib'])",
"proto_library(name = 'null_lib')");
JavaCompilationArgsProvider compilationArgsProvider =
@@ -267,6 +280,8 @@
scratch.file(
"cross/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
java_lite_proto_library(
name = "lite_pb2",
deps = ["bravo"],
@@ -344,6 +359,8 @@
scratch.file(
"x/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
java_lite_proto_library(
name = "lite_pb2",
deps = [":foo"],
@@ -411,6 +428,8 @@
scratch.file(
"protolib/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
load("//proto:extensions.bzl", "custom_rule")
proto_library(
@@ -446,6 +465,8 @@
scratch.file(
"protolib/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
proto_library(
name = "proto",
srcs = ["file.proto"],
@@ -481,6 +502,8 @@
scratch.file(
"x/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ load('@protobuf//bazel:java_lite_proto_library.bzl', 'java_lite_proto_library')
java_lite_proto_library(
name = "foo_java_proto_lite",
deps = [":foo_proto"],
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoCommonTest.java
index 5b5406d..af551bb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoCommonTest.java
@@ -59,6 +59,7 @@
scratch.file(
"third_party/x/BUILD",
"""
+ load("@protobuf//bazel:proto_library.bzl", "proto_library")
licenses(['unencumbered'])
cc_binary(name = 'plugin', srcs = ['plugin.cc'])
cc_library(name = 'runtime', srcs = ['runtime.cc'])
@@ -104,72 +105,80 @@
scratch.file(
"foo/generate.bzl",
"""
- def _resource_set_callback(os, inputs_size):
- return {'memory': 25 + 0.15 * inputs_size, 'cpu': 1}
- def _impl(ctx):
- outfile = ctx.actions.declare_file('out')
- kwargs = {}
- if ctx.attr.plugin_output == 'single':
- kwargs['plugin_output'] = outfile.path
- elif ctx.attr.plugin_output == 'multiple':
- kwargs['plugin_output'] = ctx.genfiles_dir.path
- elif ctx.attr.plugin_output == 'wrong':
- kwargs['plugin_output'] = ctx.genfiles_dir.path + '///'
- if ctx.attr.additional_args:
- additional_args = ctx.actions.args()
- additional_args.add_all(ctx.attr.additional_args)
- kwargs['additional_args'] = additional_args
- if ctx.files.additional_tools:
- kwargs['additional_tools'] = ctx.files.additional_tools
- if ctx.files.additional_inputs:
- kwargs['additional_inputs'] = depset(ctx.files.additional_inputs)
- if ctx.attr.use_resource_set:
- kwargs['resource_set'] = _resource_set_callback
- if ctx.attr.progress_message:
- kwargs['experimental_progress_message'] = ctx.attr.progress_message
- proto_common_do_not_use.compile(
- ctx.actions,
- ctx.attr.proto_dep[ProtoInfo],
- ctx.attr.toolchain[proto_common_do_not_use.ProtoLangToolchainInfo],
- [outfile],
- **kwargs)
- return [DefaultInfo(files = depset([outfile]))]
- compile_rule = rule(_impl,
- attrs = {
- 'proto_dep': attr.label(),
- 'plugin_output': attr.string(),
- 'toolchain': attr.label(default = '//foo:toolchain'),
- 'additional_args': attr.string_list(),
- 'additional_tools': attr.label_list(cfg = 'exec'),
- 'additional_inputs': attr.label_list(allow_files = True),
- 'use_resource_set': attr.bool(),
- 'progress_message': attr.string(),
- })
- """);
+load("@protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+load("@protobuf//bazel/common:proto_common.bzl", "proto_common")
+load("@protobuf//bazel/common:proto_lang_toolchain_info.bzl", "ProtoLangToolchainInfo")
+def _resource_set_callback(os, inputs_size):
+ return {'memory': 25 + 0.15 * inputs_size, 'cpu': 1}
+def _impl(ctx):
+ outfile = ctx.actions.declare_file('out')
+ kwargs = {}
+ if ctx.attr.plugin_output == 'single':
+ kwargs['plugin_output'] = outfile.path
+ elif ctx.attr.plugin_output == 'multiple':
+ kwargs['plugin_output'] = ctx.genfiles_dir.path
+ elif ctx.attr.plugin_output == 'wrong':
+ kwargs['plugin_output'] = ctx.genfiles_dir.path + '///'
+ if ctx.attr.additional_args:
+ additional_args = ctx.actions.args()
+ additional_args.add_all(ctx.attr.additional_args)
+ kwargs['additional_args'] = additional_args
+ if ctx.files.additional_tools:
+ kwargs['additional_tools'] = ctx.files.additional_tools
+ if ctx.files.additional_inputs:
+ kwargs['additional_inputs'] = depset(ctx.files.additional_inputs)
+ if ctx.attr.use_resource_set:
+ kwargs['resource_set'] = _resource_set_callback
+ if ctx.attr.progress_message:
+ kwargs['experimental_progress_message'] = ctx.attr.progress_message
+ proto_common.compile(
+ ctx.actions,
+ ctx.attr.proto_dep[ProtoInfo],
+ ctx.attr.toolchain[ProtoLangToolchainInfo],
+ [outfile],
+ **kwargs)
+ return [DefaultInfo(files = depset([outfile]))]
+compile_rule = rule(_impl,
+ attrs = {
+ 'proto_dep': attr.label(),
+ 'plugin_output': attr.string(),
+ 'toolchain': attr.label(default = '//foo:toolchain'),
+ 'additional_args': attr.string_list(),
+ 'additional_tools': attr.label_list(cfg = 'exec'),
+ 'additional_inputs': attr.label_list(allow_files = True),
+ 'use_resource_set': attr.bool(),
+ 'progress_message': attr.string(),
+ })
+""");
scratch.file(
"foo/should_generate.bzl",
"""
- BoolProvider = provider()
- def _impl(ctx):
- result = proto_common_do_not_use.experimental_should_generate_code(
- ctx.attr.proto_dep[ProtoInfo],
- ctx.attr.toolchain[proto_common_do_not_use.ProtoLangToolchainInfo],
- 'MyRule',
- ctx.attr.proto_dep.label)
- return [BoolProvider(value = result)]
- should_compile_rule = rule(_impl,
- attrs = {
- 'proto_dep': attr.label(),
- 'toolchain': attr.label(default = '//foo:toolchain'),
- })
- """);
+load("@protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+load("@protobuf//bazel/common:proto_common.bzl", "proto_common")
+load("@protobuf//bazel/common:proto_lang_toolchain_info.bzl", "ProtoLangToolchainInfo")
+BoolProvider = provider()
+def _impl(ctx):
+ result = proto_common.experimental_should_generate_code(
+ ctx.attr.proto_dep[ProtoInfo],
+ ctx.attr.toolchain[ProtoLangToolchainInfo],
+ 'MyRule',
+ ctx.attr.proto_dep.label)
+ return [BoolProvider(value = result)]
+should_compile_rule = rule(_impl,
+ attrs = {
+ 'proto_dep': attr.label(),
+ 'toolchain': attr.label(default = '//foo:toolchain'),
+ })
+""");
scratch.file(
"foo/declare_generated_files.bzl",
"""
+ load("@protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+ load("@protobuf//bazel/common:proto_common.bzl", "proto_common")
def _impl(ctx):
- files = proto_common_do_not_use.declare_generated_files(
+ files = proto_common.declare_generated_files(
ctx.actions,
ctx.attr.proto_dep[ProtoInfo],
ctx.attr.extension,
@@ -188,18 +197,21 @@
scratch.file(
"foo/check_collocated.bzl",
"""
- def _impl(ctx):
- proto_common_do_not_use.check_collocated(
- ctx.label,
- ctx.attr.proto_dep[ProtoInfo],
- ctx.attr.toolchain[proto_common_do_not_use.ProtoLangToolchainInfo])
- return None
- check_collocated = rule(_impl,
- attrs = {
- 'proto_dep': attr.label(),
- 'toolchain': attr.label(default = '//foo:toolchain'),
- })
- """);
+load("@protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+load("@protobuf//bazel/common:proto_common.bzl", "proto_common")
+load("@protobuf//bazel/common:proto_lang_toolchain_info.bzl", "ProtoLangToolchainInfo")
+def _impl(ctx):
+ proto_common.check_collocated(
+ ctx.label,
+ ctx.attr.proto_dep[ProtoInfo],
+ ctx.attr.toolchain[ProtoLangToolchainInfo])
+ return None
+check_collocated = rule(_impl,
+ attrs = {
+ 'proto_dep': attr.label(),
+ 'toolchain': attr.label(default = '//foo:toolchain'),
+ })
+""");
}
// LINT.IfChange
@@ -209,7 +221,7 @@
public void protoCommonCompile_basic() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto')");
@@ -232,7 +244,7 @@
public void protoCommonCompile_noPlugin() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto',",
@@ -256,7 +268,7 @@
public void protoCommonCompile_withPluginOutput() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto', plugin_output = 'single')");
@@ -288,7 +300,7 @@
public void protoCommonCompile_withDirectoryPluginOutput() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto', plugin_output = 'multiple')");
@@ -321,7 +333,7 @@
public void protoCommonCompile_additionalArgs() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto', additional_args = ['--a', '--b'])");
@@ -333,11 +345,11 @@
assertThat(cmdLine)
.comparingElementsUsing(MATCHES_REGEX)
.containsExactly(
- "--a",
- "--b",
"--plugin=bl?azel?-out/[^/]*-exec-[^/]*/bin/third_party/x/plugin",
"-I.",
- "bar/A.proto")
+ "bar/A.proto",
+ "--a",
+ "--b")
.inOrder();
}
@@ -349,7 +361,7 @@
public void protoCommonCompile_additionalTools() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"cc_binary(name = 'tool1', srcs = ['tool1.cc'])",
@@ -372,7 +384,7 @@
public void protoCommonCompile_additionalToolsNoPlugin() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"cc_binary(name = 'tool1', srcs = ['tool1.cc'])",
@@ -398,7 +410,7 @@
public void protoCommonCompile_additionalInputs() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto',",
@@ -418,7 +430,7 @@
public void protoCommonCompile_resourceSet() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto', use_resource_set = True)");
@@ -438,7 +450,7 @@
useConfiguration("--protocopt=--foo", "--protocopt=--bar");
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto')");
@@ -466,7 +478,7 @@
public void protoCommonCompile_directGeneratedProtos() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"genrule(name = 'generate', srcs = ['A.txt'], cmd = '', outs = ['G.proto'])",
"proto_library(name = 'proto', srcs = ['A.proto', 'G.proto'])",
@@ -501,7 +513,7 @@
public void protoCommonCompile_inDirectGeneratedProtos() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"genrule(name = 'generate', srcs = ['A.txt'], cmd = '', outs = ['G.proto'])",
"proto_library(name = 'generated', srcs = ['G.proto'])",
@@ -546,6 +558,9 @@
})
public void protoCommonCompile_externalProtoLibrary(
boolean sibling, boolean generated, List<String> expectedFlags) throws Exception {
+ if (!analysisMock.isThisBazel()) {
+ return;
+ }
if (sibling) {
setBuildLanguageOptions("--experimental_sibling_repository_layout");
}
@@ -556,14 +571,14 @@
scratch.file("/foo/MODULE.bazel", "module(name = 'foo')");
scratch.file(
"/foo/e/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='e', srcs=['E.proto'])",
generated
? "genrule(name = 'generate', srcs = ['A.txt'], cmd = '', outs = ['E.proto'])"
: "");
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'], deps = ['@foo//e:e'])",
"compile_rule(name = 'simple', proto_dep = ':proto')");
@@ -594,7 +609,7 @@
public void protoCommonCompile_overrideProgressMessage() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:generate.bzl', 'compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"compile_rule(name = 'simple', proto_dep = ':proto', progress_message = 'My %{label}')");
@@ -617,7 +632,7 @@
public void shouldprotoCommonCompile_basic() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:should_generate.bzl', 'should_compile_rule')",
"proto_library(name = 'proto', srcs = ['A.proto'])",
"should_compile_rule(name = 'simple', proto_dep = ':proto')");
@@ -633,7 +648,7 @@
public void shouldprotoCommonCompile_dontGenerate() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:should_generate.bzl', 'should_compile_rule')",
"should_compile_rule(name = 'simple', proto_dep = '//third_party/x:denied')");
@@ -648,7 +663,7 @@
public void shouldprotoCommonCompile_mixed() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:should_generate.bzl', 'should_compile_rule')",
"should_compile_rule(name = 'simple', proto_dep = '//third_party/x:mixed')");
@@ -668,7 +683,7 @@
public void declareGenerateFiles_basic() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:declare_generated_files.bzl', 'declare_generated_files')",
"proto_library(name = 'proto', srcs = ['A.proto', 'b/B.proto'])",
"declare_generated_files(name = 'simple', proto_dep = ':proto', extension = '.cc')");
@@ -684,7 +699,7 @@
public void declareGenerateFiles_pythonc() throws Exception {
scratch.file(
"bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load('//foo:declare_generated_files.bzl', 'declare_generated_files')",
"proto_library(name = 'proto', srcs = ['my-proto.gen.proto'])",
"declare_generated_files(name = 'simple', proto_dep = ':proto', extension = '_pb2.py',",
@@ -700,7 +715,7 @@
public void langProtoLibrary_inDifferentPackage_allowed() throws Exception {
scratch.file(
"proto/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name = 'proto', srcs = ['A.proto'])");
scratch.file(
"bar/BUILD",
@@ -718,7 +733,7 @@
public void langProtoLibrary_inDifferentPackage_fails() throws Exception {
scratch.file(
"proto/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name = 'proto', srcs = ['A.proto'])");
scratch.file(
"test/BUILD",
@@ -740,6 +755,7 @@
scratch.file(
"x/BUILD",
"""
+ load("@protobuf//bazel:proto_library.bzl", "proto_library")
proto_library(name='foo', srcs=['foo.proto'], allow_exports = ':test')
package_group(
name='test',
@@ -749,6 +765,7 @@
scratch.file(
"notallowed/BUILD",
"""
+ load("@protobuf//bazel:proto_library.bzl", "proto_library")
load('//foo:check_collocated.bzl', 'check_collocated')
check_collocated(name = 'simple', proto_dep = '//x:foo')
""");
@@ -766,6 +783,7 @@
scratch.file(
"x/BUILD",
"""
+ load("@protobuf//bazel:proto_library.bzl", "proto_library")
proto_library(name='foo', srcs=['foo.proto'], allow_exports = ':test')
package_group(
name='test',
@@ -775,6 +793,7 @@
scratch.file(
"allowed/BUILD",
"""
+ load("@protobuf//bazel:proto_library.bzl", "proto_library")
load('//foo:check_collocated.bzl', 'check_collocated')
check_collocated(name = 'simple', proto_dep = '//x:foo')
""");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
index d354bb2..71bf550 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
@@ -29,7 +29,6 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.packages.util.MockProtoSupport;
-import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.List;
import org.junit.Before;
@@ -65,7 +64,7 @@
setBuildLanguageOptions("--incompatible_enable_proto_toolchain_resolution");
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='foo', srcs=['foo.proto'])");
getDescriptorOutput("//x:foo");
@@ -77,7 +76,7 @@
public void createsDescriptorSets() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='alias', deps = ['foo'])",
"proto_library(name='foo', srcs=['foo.proto'])",
"proto_library(name='alias_to_no_srcs', deps = ['no_srcs'])",
@@ -97,7 +96,7 @@
public void descriptorSets_ruleWithSrcsCallsProtoc() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='foo', srcs=['foo.proto'])");
Artifact file = getDescriptorOutput("//x:foo");
@@ -108,7 +107,10 @@
/** Asserts that we register a FileWriteAction with empty contents if there are no srcs. */
@Test
public void descriptorSets_ruleWithoutSrcsWritesEmptyFile() throws Exception {
- scratch.file("x/BUILD", TestConstants.LOAD_PROTO_LIBRARY, "proto_library(name='no_srcs')");
+ scratch.file(
+ "x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "proto_library(name='no_srcs')");
Action action = getDescriptorWriteAction("//x:no_srcs");
assertThat(action).isInstanceOf(FileWriteAction.class);
assertThat(((FileWriteAction) action).getFileContents()).isEmpty();
@@ -126,7 +128,7 @@
public void descriptorSetsDependOnChildren() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='alias', deps = ['foo'])",
"proto_library(name='foo', srcs=['foo.proto'], deps = ['bar'])",
"proto_library(name='bar', srcs=['bar.proto'])",
@@ -161,7 +163,7 @@
public void descriptorSetsAreExposedInProvider() throws Exception {
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='alias', deps = ['foo'])",
"proto_library(name='foo', srcs=['foo.proto'], deps = ['bar'])",
"proto_library(name='bar', srcs=['bar.proto'])",
@@ -218,7 +220,7 @@
useConfiguration("--proto_compiler=//proto:compiler", "--strict_proto_deps=error");
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='nodeps', srcs=['nodeps.proto'])",
"proto_library(name='withdeps', srcs=['withdeps.proto'], deps=[':dep1', ':dep2'])",
"proto_library(name='depends_on_alias', srcs=['depends_on_alias.proto'], deps=[':alias'])",
@@ -257,7 +259,7 @@
scratchConfiguredTarget(
"x",
"foo",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='foo', srcs=['foo.proto', 'bar.proto'])");
Artifact file = getFirstArtifactEndingWith(getFilesToBuild(target), ".proto.bin");
assertThat(file.getRootRelativePathString()).isEqualTo("x/foo-descriptor-set.proto.bin");
@@ -274,7 +276,7 @@
scratchConfiguredTarget(
"x",
"foo",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='foo', srcs=['foo.proto', 'bar.proto'])");
Artifact file = getFirstArtifactEndingWith(getFilesToBuild(target), ".proto.bin");
assertThat(file.getRootRelativePathString()).isEqualTo("x/foo-descriptor-set.proto.bin");
@@ -289,7 +291,7 @@
useConfiguration("--proto_compiler=//proto:compiler", "--strict_proto_deps=off");
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='foo', srcs=['foo.proto'])");
for (String arg :
@@ -306,7 +308,7 @@
useConfiguration("--proto_compiler=//proto:compiler", "--strict_proto_deps=default");
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='foo', srcs=['foo.proto'])");
for (String arg :
@@ -322,7 +324,7 @@
public void testStripImportPrefixWithoutDeps() throws Exception {
scratch.file(
"third_party/x/foo/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"licenses(['unencumbered'])",
"proto_library(",
" name = 'nodeps',",
@@ -346,7 +348,7 @@
useConfiguration("--strict_public_imports=ERROR", "--proto_compiler=//proto:compiler");
scratch.file(
"test/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'myProto',",
" srcs = ['myProto.proto'],",
@@ -365,6 +367,7 @@
scratch.file(
"test/BUILD",
"""
+ load("@protobuf//bazel:proto_library.bzl", "proto_library")
proto_library(
name = "myProto",
srcs = ["myProto.proto"],
@@ -384,6 +387,7 @@
scratch.file(
"x/BUILD",
"""
+ load("@protobuf//bazel:proto_library.bzl", "proto_library")
proto_library(
name = "prototop",
srcs = ["top.proto"],
@@ -428,7 +432,7 @@
public void testStripImportPrefixWithDepsDuplicate() throws Exception {
scratch.file(
"third_party/x/foo/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"licenses(['unencumbered'])",
"proto_library(",
" name = 'withdeps',",
@@ -461,7 +465,7 @@
public void testStripImportPrefixWithDeps() throws Exception {
scratch.file(
"third_party/x/foo/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"licenses(['unencumbered'])",
"proto_library(",
" name = 'withdeps',",
@@ -475,7 +479,7 @@
")");
scratch.file(
"third_party/x/bar/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"licenses(['unencumbered'])",
"proto_library(",
" name = 'dep',",
@@ -508,12 +512,12 @@
scratch.file("/foo/MODULE.bazel", "module(name = 'foo')");
scratch.file(
"/foo/x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='x', srcs=['generated.proto'])",
"genrule(name='g', srcs=[], outs=['generated.proto'], cmd='')");
scratch.file(
"a/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='a', srcs=['a.proto'], deps=['@foo//x:x'])");
invalidatePackages();
@@ -551,23 +555,23 @@
scratch.file(
"ad/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='ad', strip_import_prefix='/ad', srcs=['ad.proto'])");
scratch.file(
"ae/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='ae', strip_import_prefix='/ae', srcs=['ae.proto'])");
scratch.file(
"bd/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='bd', strip_import_prefix='/bd', srcs=['bd.proto'])");
scratch.file(
"be/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='be', strip_import_prefix='/be', srcs=['be.proto'])");
scratch.file(
"a/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name='a',",
" strip_import_prefix='/a',",
@@ -576,7 +580,7 @@
" deps=['//ad:ad'])");
scratch.file(
"b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name='b',",
" strip_import_prefix='/b',",
@@ -585,7 +589,7 @@
" deps=['//bd:bd'])");
scratch.file(
"c/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name='c',",
" strip_import_prefix='/c',",
@@ -622,7 +626,7 @@
scratch.file("/yolo_repo/yolo_pkg/yolo.proto");
scratch.file(
"/yolo_repo/yolo_pkg/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'yolo_proto',",
" srcs = ['yolo.proto'],",
@@ -666,7 +670,7 @@
scratch.file("/yolo_repo/yolo_pkg_to_be_stripped/yolo_pkg/yolo.proto");
scratch.file(
"/yolo_repo/yolo_pkg_to_be_stripped/yolo_pkg/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'yolo_proto',",
" srcs = ['yolo.proto'],",
@@ -712,7 +716,7 @@
scratch.file("/yolo_repo/yolo_pkg_to_be_stripped/yolo_pkg/yolo.proto");
scratch.file(
"/yolo_repo/yolo_pkg_to_be_stripped/yolo_pkg/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'yolo_proto',",
" srcs = ['yolo.proto'],",
@@ -758,7 +762,7 @@
scratch.file("/yolo_repo/yolo_pkg_to_be_stripped/yolo_pkg/yolo.proto");
scratch.file(
"/yolo_repo/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'yolo_proto',",
" srcs = ['yolo_pkg_to_be_stripped/yolo_pkg/yolo.proto'],",
@@ -789,7 +793,7 @@
scratch.file(
"third_party/a/BUILD",
"licenses(['unencumbered'])",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'a',",
" srcs = ['a.proto'],",
@@ -809,7 +813,7 @@
scratch.file(
"a/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'a',",
" srcs = ['a.proto'],",
@@ -825,7 +829,7 @@
scratch.file(
"third_party/a/b/BUILD",
"licenses(['unencumbered'])",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -842,7 +846,7 @@
scratch.file(
"third_party/a/b/BUILD",
"licenses(['unencumbered'])",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -859,7 +863,7 @@
scratch.file(
"third_party/a/b/BUILD",
"licenses(['unencumbered'])",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -879,7 +883,7 @@
scratch.file(
"a/b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -900,7 +904,7 @@
scratch.file(
"a/b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -917,7 +921,7 @@
scratch.file(
"third_party/a/b/BUILD",
"licenses(['unencumbered'])",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -933,7 +937,7 @@
scratch.file(
"third_party/a/b/BUILD",
"licenses(['unencumbered'])",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -952,7 +956,7 @@
scratch.file(
"a/b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -971,7 +975,7 @@
scratch.file(
"a/b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -991,7 +995,7 @@
useConfiguration("--strict_proto_deps=STRICT");
scratch.file(
"a/b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto','c/e.proto'],",
@@ -1011,14 +1015,14 @@
useConfiguration("--strict_proto_deps=STRICT");
scratch.file(
"a/b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
" strip_import_prefix = 'c')");
scratch.file(
"a/b/e/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'e',",
" srcs = ['e.proto'],",
@@ -1040,7 +1044,7 @@
useConfiguration("--strict_proto_deps=STRICT");
scratch.file(
"a/b/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'd',",
" srcs = ['c/d.proto'],",
@@ -1066,7 +1070,7 @@
scratch.file("/foo/MODULE.bazel", "module(name = 'foo')");
scratch.file(
"/foo/x/y/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'q',",
" srcs = ['z/q.proto'],",
@@ -1074,7 +1078,7 @@
scratch.file(
"a/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='a', srcs=['a.proto'], deps=['@foo//x/y:q'])");
invalidatePackages();
@@ -1101,7 +1105,7 @@
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'a_proto',",
" srcs = ['a.proto'],",
@@ -1121,7 +1125,7 @@
useConfiguration("--experimental_proto_descriptor_sets_include_source_info");
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(",
" name = 'a_proto',",
" srcs = ['a.proto'],",
@@ -1136,7 +1140,7 @@
public void testSourceAndGeneratedProtoFiles() throws Exception {
scratch.file(
"a/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"genrule(name='g', srcs=[], outs=['g.proto'], cmd = '')",
"proto_library(name='p', srcs=['s.proto', 'g.proto'])");
@@ -1155,7 +1159,7 @@
scratch.file("third_party/foo/MODULE.bazel", "module(name = 'foo')");
scratch.file(
"third_party/foo/BUILD.bazel",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='a', srcs=['a.proto'])",
"proto_library(name='c', srcs=['a/b/c.proto'])");
scratch.appendFile(
@@ -1166,7 +1170,7 @@
scratch.file(
"x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='a', srcs=['a.proto'], deps=['@foo//:a'])",
"proto_library(name='c', srcs=['c.proto'], deps=['@foo//:c'])");
@@ -1185,7 +1189,10 @@
@Test
public void testProtoLibrary() throws Exception {
- scratch.file("x/BUILD", "proto_library(name='foo', srcs=['a.proto', 'b.proto', 'c.proto'])");
+ scratch.file(
+ "x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "proto_library(name='foo', srcs=['a.proto', 'b.proto', 'c.proto'])");
ProtoInfo provider = getConfiguredTarget("//x:foo").get(ProtoInfo.PROVIDER);
assertThat(Iterables.transform(provider.getDirectSources(), s -> s.getExecPathString()))
@@ -1194,7 +1201,10 @@
@Test
public void testProtoLibraryWithoutSources() throws Exception {
- scratch.file("x/BUILD", "proto_library(name='foo')");
+ scratch.file(
+ "x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "proto_library(name='foo')");
ProtoInfo provider = getConfiguredTarget("//x:foo").get(ProtoInfo.PROVIDER);
assertThat(provider.getDirectSources()).isEmpty();
@@ -1206,7 +1216,10 @@
return;
}
- scratch.file("x/BUILD", "proto_library(name='foo', srcs=['a.proto'], import_prefix='foo')");
+ scratch.file(
+ "x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "proto_library(name='foo', srcs=['a.proto'], import_prefix='foo')");
String genfiles = getTargetConfiguration().getGenfilesFragment(RepositoryName.MAIN).toString();
ProtoInfo provider = getConfiguredTarget("//x:foo").get(ProtoInfo.PROVIDER);
@@ -1222,6 +1235,7 @@
scratch.file(
"x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"""
genrule(
name = "g",
@@ -1250,6 +1264,7 @@
scratch.file(
"x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"""
genrule(
name = "g",
@@ -1277,6 +1292,7 @@
public void protoLibrary_reexport_allowed() throws Exception {
scratch.file(
"x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"""
proto_library(
name = "foo",
@@ -1291,6 +1307,7 @@
""");
scratch.file(
"allowed/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"""
proto_library(
name = "test1",
@@ -1314,30 +1331,7 @@
public void protoLibrary_implcitReexport_fails() throws Exception {
scratch.file(
"x/BUILD",
- """
- proto_library(
- name = "foo",
- srcs = ["foo.proto"],
- allow_exports = ":test",
- )
-
- package_group(
- name = "test",
- packages = ["//allowed"],
- )
- """);
- scratch.file("notallowed/BUILD", "proto_library(name='test', deps = ['//x:foo'])");
-
- reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//notallowed:test");
-
- assertContainsEvent("proto_library '@@//x:foo' can't be reexported in package '//notallowed'");
- }
-
- @Test
- public void protoLibrary_explicitExport_fails() throws Exception {
- scratch.file(
- "x/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"""
proto_library(
name = "foo",
@@ -1352,6 +1346,35 @@
""");
scratch.file(
"notallowed/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
+ "proto_library(name='test', deps = ['//x:foo'])");
+
+ reporter.removeHandler(failFastHandler);
+ getConfiguredTarget("//notallowed:test");
+
+ assertContainsEvent("proto_library '@@//x:foo' can't be reexported in package '//notallowed'");
+ }
+
+ @Test
+ public void protoLibrary_explicitExport_fails() throws Exception {
+ scratch.file(
+ "x/BUILD",
+ """
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
+ proto_library(
+ name = "foo",
+ srcs = ["foo.proto"],
+ allow_exports = ":test",
+ )
+
+ package_group(
+ name = "test",
+ packages = ["//allowed"],
+ )
+ """);
+ scratch.file(
+ "notallowed/BUILD",
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"proto_library(name='test', srcs = ['A.proto'], exports = ['//x:foo'])");
reporter.removeHandler(failFastHandler);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java
index 3155b86..6e3075e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java
@@ -27,7 +27,6 @@
import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.MockProtoSupport;
-import com.google.devtools.build.lib.testutil.TestConstants;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -64,6 +63,7 @@
scratch.file(
"foo/test.bzl",
"""
+ load('@protobuf//bazel/common:proto_info.bzl', 'ProtoInfo')
load("//myinfo:myinfo.bzl", "MyInfo")
def _impl(ctx):
@@ -76,7 +76,7 @@
scratch.file(
"foo/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"load(':test.bzl', 'test')",
"test(name='test', dep=':proto')",
"proto_library(name='proto', srcs=['p.proto'])");
@@ -93,6 +93,7 @@
scratch.file(
"third_party/foo/myTestRule.bzl",
"""
+ load('@protobuf//bazel/common:proto_info.bzl', 'ProtoInfo')
load("//myinfo:myinfo.bzl", "MyInfo")
def _my_test_rule_impl(ctx):
@@ -108,7 +109,7 @@
scratch.file(
"third_party/foo/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"licenses(['unencumbered'])",
"load(':myTestRule.bzl', 'my_test_rule')",
"my_test_rule(",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
index 41fb12d..94e4f98 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
@@ -72,6 +72,7 @@
scratch.file(
"third_party/x/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
licenses(["unencumbered"])
cc_binary(
@@ -134,6 +135,7 @@
scratch.file(
"third_party/x/BUILD",
"""
+ load('@protobuf//bazel:proto_library.bzl', 'proto_library')
licenses(["unencumbered"])
cc_binary(
@@ -193,7 +195,7 @@
public void protoToolchainBlacklistProtoLibraries() throws Exception {
scratch.file(
"third_party/x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"licenses(['unencumbered'])",
"cc_binary(name = 'plugin', srcs = ['plugin.cc'])",
"cc_library(name = 'runtime', srcs = ['runtime.cc'])",
@@ -225,7 +227,7 @@
public void protoToolchainBlacklistTransitiveProtos() throws Exception {
scratch.file(
"third_party/x/BUILD",
- TestConstants.LOAD_PROTO_LIBRARY,
+ "load('@protobuf//bazel:proto_library.bzl', 'proto_library')",
"licenses(['unencumbered'])",
"cc_binary(name = 'plugin', srcs = ['plugin.cc'])",
"cc_library(name = 'runtime', srcs = ['runtime.cc'])",
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index 72d2046..7e2d897 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -23,11 +23,8 @@
*/
public class TestConstants {
- public static final String LOAD_PROTO_LIBRARY =
- "load('@protobuf//bazel:proto_library.bzl', 'proto_library')";
public static final String PROTO_TOOLCHAIN = "@protobuf//bazel/private:proto_toolchain_type";
- public static final String LOAD_PROTO_TOOLCHAIN =
- "load('@protobuf//bazel/toolchains:proto_toolchain.bzl', 'proto_toolchain')";
+
public static final String LOAD_PROTO_LANG_TOOLCHAIN =
"load('@protobuf//bazel/toolchains:proto_lang_toolchain.bzl', 'proto_lang_toolchain')";
