Depend on renderer built from HEAD from skydoc_test
Also do some quality-of-life cleanup: give sensible defaults to skydoc_test stardoc and renderer locations, so that they need not be specified in every target
RELNOTES: None.
PiperOrigin-RevId: 259803384
diff --git a/src/main/java/com/google/devtools/build/skydoc/renderer/BUILD b/src/main/java/com/google/devtools/build/skydoc/renderer/BUILD
index 9f57845..4f8ebc3 100644
--- a/src/main/java/com/google/devtools/build/skydoc/renderer/BUILD
+++ b/src/main/java/com/google/devtools/build/skydoc/renderer/BUILD
@@ -20,7 +20,7 @@
# ... but only on JDK >= 9
"-XX:+IgnoreUnrecognizedVMOptions",
],
- main_class = "com.google.devtools.build.skydoc.RendererMain",
+ main_class = "com.google.devtools.build.skydoc.renderer.RendererMain",
visibility = ["//visibility:public"],
runtime_deps = [
":renderer_lib",
diff --git a/src/test/java/com/google/devtools/build/skydoc/BUILD b/src/test/java/com/google/devtools/build/skydoc/BUILD
index 26897ba..bd07e0c 100644
--- a/src/test/java/com/google/devtools/build/skydoc/BUILD
+++ b/src/test/java/com/google/devtools/build/skydoc/BUILD
@@ -69,21 +69,18 @@
format = "proto",
golden_file = "testdata/proto_format_test/golden.raw",
input_file = "testdata/proto_format_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "cc_api_test",
golden_file = "testdata/cc_api_test/golden.txt",
input_file = "testdata/cc_api_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "simple_test",
golden_file = "testdata/simple_test/golden.txt",
input_file = "testdata/simple_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["my_rule"],
)
@@ -91,21 +88,18 @@
name = "repo_rule_test",
golden_file = "testdata/repo_rules_test/golden.txt",
input_file = "testdata/repo_rules_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "unknown_name",
golden_file = "testdata/unknown_name_test/golden.txt",
input_file = "testdata/unknown_name_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "multiple_rules_test",
golden_file = "testdata/multiple_rules_test/golden.txt",
input_file = "testdata/multiple_rules_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
@@ -115,7 +109,6 @@
semantic_flags = [
"--experimental_google_legacy_api",
],
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["android_related_rule"],
)
@@ -123,7 +116,6 @@
name = "apple_basic_test",
golden_file = "testdata/apple_basic_test/golden.txt",
input_file = "testdata/apple_basic_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["apple_related_rule"],
)
@@ -131,7 +123,6 @@
name = "cpp_basic_test",
golden_file = "testdata/cpp_basic_test/golden.txt",
input_file = "testdata/cpp_basic_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["cpp_related_rule"],
)
@@ -139,7 +130,6 @@
name = "java_basic_test",
golden_file = "testdata/java_basic_test/golden.txt",
input_file = "testdata/java_basic_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["java_related_rule"],
)
@@ -147,7 +137,6 @@
name = "multiple_files_test",
golden_file = "testdata/multiple_files_test/golden.txt",
input_file = "testdata/multiple_files_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
deps = [
"testdata/multiple_files_test/dep.bzl",
"testdata/multiple_files_test/inner_dep.bzl",
@@ -158,7 +147,6 @@
name = "same_level_file_test",
golden_file = "//src/test/java/com/google/devtools/build/skydoc/testdata/same_level_file_test:golden.txt",
input_file = "//src/test/java/com/google/devtools/build/skydoc/testdata/same_level_file_test:input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["my_rule"],
deps = [
"//src/test/java/com/google/devtools/build/skydoc/testdata/same_level_file_test:dep.bzl",
@@ -169,14 +157,12 @@
name = "misc_apis_test",
golden_file = "testdata/misc_apis_test/golden.txt",
input_file = "testdata/misc_apis_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "attribute_types_test",
golden_file = "testdata/attribute_types_test/golden.txt",
input_file = "testdata/attribute_types_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["my_rule"],
)
@@ -184,7 +170,6 @@
name = "filter_rules_test",
golden_file = "testdata/filter_rules_test/golden.txt",
input_file = "testdata/filter_rules_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = [
"my_rule",
"whitelisted_dep_rule",
@@ -198,28 +183,24 @@
name = "provider_basic_test",
golden_file = "testdata/provider_basic_test/golden.txt",
input_file = "testdata/provider_basic_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "function_basic_test",
golden_file = "testdata/function_basic_test/golden.txt",
input_file = "testdata/function_basic_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "namespace_test",
golden_file = "testdata/namespace_test/golden.txt",
input_file = "testdata/namespace_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "namespace_test_with_whitelist",
golden_file = "testdata/namespace_test/golden.txt",
input_file = "testdata/namespace_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = [
"my_namespace",
],
@@ -229,14 +210,12 @@
name = "multi_level_namespace_test",
golden_file = "testdata/multi_level_namespace_test/golden.txt",
input_file = "testdata/multi_level_namespace_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "multi_level_namespace_test_with_whitelist",
golden_file = "testdata/multi_level_namespace_test_with_whitelist/golden.txt",
input_file = "testdata/multi_level_namespace_test_with_whitelist/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = [
"my_namespace",
"other_namespace.foo.nothing",
@@ -247,14 +226,12 @@
name = "macro_kwargs_test",
golden_file = "testdata/macro_kwargs_test/golden.txt",
input_file = "testdata/macro_kwargs_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
skydoc_test(
name = "py_rule_test",
golden_file = "testdata/py_rule_test/golden.txt",
input_file = "testdata/py_rule_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
whitelisted_symbols = ["py_related_rule"],
)
@@ -262,7 +239,6 @@
name = "struct_default_value_test",
golden_file = "testdata/struct_default_value_test/golden.txt",
input_file = "testdata/struct_default_value_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
)
genrule(
@@ -276,7 +252,6 @@
name = "generated_bzl_test",
golden_file = "testdata/generated_bzl_test/golden.txt",
input_file = "testdata/generated_bzl_test/input.bzl",
- skydoc = "//src/main/java/com/google/devtools/build/skydoc",
deps = [
"testdata/generated_bzl_test/dep.bzl",
],
diff --git a/src/test/java/com/google/devtools/build/skydoc/skydoc_test.bzl b/src/test/java/com/google/devtools/build/skydoc/skydoc_test.bzl
index 3f0f964..3cc25984 100644
--- a/src/test/java/com/google/devtools/build/skydoc/skydoc_test.bzl
+++ b/src/test/java/com/google/devtools/build/skydoc/skydoc_test.bzl
@@ -27,7 +27,6 @@
name,
input_file,
golden_file,
- skydoc,
deps = [],
whitelisted_symbols = [],
semantic_flags = [],
@@ -87,7 +86,8 @@
input = input_file,
symbol_names = whitelisted_symbols,
deps = ["%s_lib" % name],
- stardoc = skydoc,
+ renderer = Label("//src/main/java/com/google/devtools/build/skydoc/renderer:renderer"),
+ stardoc = Label("//src/main/java/com/google/devtools/build/skydoc:skydoc"),
semantic_flags = semantic_flags,
format = format,
)
