Make AbstractPackageLoaderTest usable without pulling in impl test
PiperOrigin-RevId: 380118631
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index ff89257..4523fe5 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -358,7 +358,6 @@
name = "all_windows_tests",
tests = [
":windows_tests",
- "//src/test/java/com/google/devtools/build/lib/skyframe/packages:all_windows_tests",
],
visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD
index 1cb1a7f..393bb1a 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD
@@ -1,59 +1,51 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
-package(
- default_testonly = 1,
- default_visibility = ["//src:__subpackages__"],
-)
+package(default_visibility = ["//src:__subpackages__"])
filegroup(
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+ visibility = ["//src:__subpackages__"],
)
-java_test(
- name = "BazelPackageLoaderTest",
- srcs = [
- "AbstractPackageLoaderTest.java",
- "BazelPackageLoaderTest.java",
- ],
+java_library(
+ name = "AbstractPackageLoaderTest",
+ testonly = 1,
+ srcs = ["AbstractPackageLoaderTest.java"],
deps = [
- "//src/main/java/com/google/devtools/build/lib/analysis:server_directories",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/events",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
"//src/main/java/com/google/devtools/build/lib/skyframe/packages:AbstractPackageLoader",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:BazelPackageLoader",
"//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageLoader",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
- "//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/packages:testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil",
"//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
- "//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
],
)
-test_suite(
- name = "windows_tests",
- tags = [
- "-no_windows",
- "-slow",
+java_test(
+ name = "BazelPackageLoaderTest",
+ srcs = ["BazelPackageLoaderTest.java"],
+ deps = [
+ ":AbstractPackageLoaderTest",
+ "//src/main/java/com/google/devtools/build/lib/analysis:server_directories",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/packages:BazelPackageLoader",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageLoader",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//third_party:junit4",
+ "//third_party:truth",
],
- visibility = ["//visibility:private"],
)
-test_suite(
- name = "all_windows_tests",
- tests = [
- ":windows_tests",
- ],
- visibility = ["//src/test/java/com/google/devtools/build/lib/skyframe:__pkg__"],
-)
+test_suite(name = "all_tests")
