Docgen BUILD file consolidation Standardizing internal/external BUILD file management. This does unfortunately remove tests from `all_windows_tests`, which seems like it's suffering from some bitrot (https://github.com/bazelbuild/bazel/issues/4292#issuecomment-860914458). We _could_ explicitly add the docgen tests, and while it's bound to be an unpopular opinion, I think we should avoid setting the precedent of explicitly enumerating windows tests as it's unlikely to scale. PiperOrigin-RevId: 379481390
diff --git a/src/BUILD b/src/BUILD index a67fe37..4d827ba 100644 --- a/src/BUILD +++ b/src/BUILD
@@ -498,7 +498,6 @@ ":windows_tests", "//src/test/cpp:all_windows_tests", "//src/test/java/com/google/devtools/build/android:all_windows_tests", - "//src/test/java/com/google/devtools/build/docgen:all_windows_tests", "//src/test/java/com/google/devtools/build/lib:all_windows_tests", "//src/test/java/com/google/devtools/build/skyframe:all_windows_tests", "//src/test/java/com/google/devtools/common/options:all_windows_tests",
diff --git a/src/test/java/com/google/devtools/build/docgen/BUILD b/src/test/java/com/google/devtools/build/docgen/BUILD index 5127fcd..71d001a 100644 --- a/src/test/java/com/google/devtools/build/docgen/BUILD +++ b/src/test/java/com/google/devtools/build/docgen/BUILD
@@ -1,7 +1,6 @@ load("@rules_java//java:defs.bzl", "java_library", "java_test") package( - default_testonly = 1, default_visibility = ["//src:__subpackages__"], ) @@ -9,7 +8,7 @@ name = "srcs", testonly = 0, srcs = glob(["**"]), - visibility = ["//src:__pkg__"], + visibility = ["//src:__subpackages__"], ) java_test( @@ -18,9 +17,10 @@ srcs = ["DocumentationTests.java"], shard_count = 1, tags = ["docgen"], - deps = [ + runtime_deps = [ ":documentation-tests", - "//src/test/java/com/google/devtools/build/lib/testutil", + ], + deps = [ "//src/test/java/com/google/devtools/build/lib/testutil:TestSuite", "//third_party:junit4", ], @@ -46,9 +46,6 @@ "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/net/starlark/java/annot", "//src/main/java/net/starlark/java/eval", - "//src/main/java/net/starlark/java/syntax", - "//src/test/java/com/google/devtools/build/lib/starlark/util", - "//src/test/java/com/google/devtools/build/lib/testutil", "//third_party:guava", "//third_party:junit4", "//third_party:truth", @@ -61,32 +58,9 @@ srcs = glob(["testutil/*.java"]), deps = [ "//src/main/java/com/google/devtools/build/lib/actions", - "//src/main/java/com/google/devtools/build/lib/actions:artifacts", "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster", "//src/main/java/com/google/devtools/build/lib/analysis:configured_target", "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", "//src/main/java/com/google/devtools/build/lib/packages", ], ) - -test_suite( - name = "all_tests", - tags = ["docgen"], -) - -test_suite( - name = "windows_tests", - tags = [ - "-no_windows", - "-slow", - ], - visibility = ["//visibility:private"], -) - -test_suite( - name = "all_windows_tests", - tests = [ - ":windows_tests", - ], - visibility = ["//src:__pkg__"], -)