Add BUILD files to each of the test/.../build/lib/rules packages.
RELNOTES: None.
PiperOrigin-RevId: 301890729
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index a9e8cef..9a39ff6 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -48,17 +48,8 @@
"//src/test/java/com/google/devtools/build/lib/profiler/callcounts:srcs",
"//src/test/java/com/google/devtools/build/lib/profiler/memory:srcs",
"//src/test/java/com/google/devtools/build/lib/query2:srcs",
- "//src/test/java/com/google/devtools/build/lib/query2/engine:srcs",
- "//src/test/java/com/google/devtools/build/lib/query2/testutil:srcs",
"//src/test/java/com/google/devtools/build/lib/remote:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/android:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/apple:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/config:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/cpp:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/objc:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/platform:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/python:srcs",
- "//src/test/java/com/google/devtools/build/lib/rules/repository:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules:srcs",
"//src/test/java/com/google/devtools/build/lib/sandbox:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe/packages:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization:srcs",
@@ -514,99 +505,6 @@
)
java_test(
- name = "filegroup-rules-tests",
- srcs = glob(["rules/filegroup/*.java"]),
- tags = ["rules"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":AllTests",
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
- "//src/main/java/com/google/devtools/build/lib:bazel-rules",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
- "//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:jsr305",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-JAVA_COMPILE_ACTION_TEST_HELPER_SRCS = ["rules/java/JavaCompileActionTestHelper.java"]
-
-java_library(
- name = "java_compile_action_test_helper",
- testonly = 1,
- srcs = JAVA_COMPILE_ACTION_TEST_HELPER_SRCS,
- deps = [
- "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:optionsparser",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
- "//third_party:guava",
- ],
-)
-
-java_test(
- name = "java-rules-tests",
- srcs = glob(
- ["rules/java/*.java"],
- exclude = JAVA_COMPILE_ACTION_TEST_HELPER_SRCS,
- ),
- tags = ["rules"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":AllTests",
- ":java_compile_action_test_helper",
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
- "//src/main/java/com/google/devtools/build/lib:bazel-rules",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:filetype",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/analysis/platform",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules",
- "//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
- "//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:jsr305",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-java_test(
- name = "test-rules-tests",
- srcs = ["rules/test/SkylarkTestingModuleTest.java"],
- tags = ["rules"],
- test_class = "com.google.devtools.build.lib.rules.test.SkylarkTestingModuleTest",
- deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:junit4",
- "//third_party:truth",
- "//third_party/protobuf:protobuf_java",
- ],
-)
-
-java_test(
name = "runtime-tests",
srcs = glob(
[
@@ -722,99 +620,6 @@
)
java_test(
- name = "ProtoCompileActionBuilderTest",
- srcs = ["rules/proto/ProtoCompileActionBuilderTest.java"],
- deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:proto-rules",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//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/actions/util",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:junit4",
- "//third_party:mockito",
- "//third_party:truth",
- ],
-)
-
-java_test(
- name = "ProtoLangToolchainTest",
- srcs = ["rules/proto/ProtoLangToolchainTest.java"],
- deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:proto-rules",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
- "//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:TestConstants",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-java_test(
- name = "BazelProtoLibraryTest",
- srcs = ["rules/proto/BazelProtoLibraryTest.java"],
- deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:proto-rules",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//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/actions/util",
- "//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",
- "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-java_test(
- name = "BazelProtoInfoStarlarkTest",
- srcs = ["rules/proto/BazelProtoInfoStarlarkTest.java"],
- deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:proto-rules",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//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/skylarkbuildapi/proto",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
- "//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",
- "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-java_test(
name = "repository-tests",
srcs = glob(["repository/*.java"]),
test_class = "com.google.devtools.build.lib.AllTests",
@@ -841,38 +646,6 @@
)
java_test(
- name = "rules-tests",
- srcs = glob(["rules/*.java"]),
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":AllTests",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:proto-rules",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/rules/cpp",
- "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto",
- "//src/main/java/com/google/devtools/build/lib/util/io",
- "//src/main/java/com/google/devtools/build/skyframe",
- "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
- "//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:TestConstants",
- "//third_party:auto_value",
- "//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-java_test(
name = "worker-tests",
srcs = glob(["worker/*Test.java"]),
test_class = "com.google.devtools.build.lib.AllTests",
@@ -1012,12 +785,7 @@
"//src/test/java/com/google/devtools/build/lib/buildtool:all_windows_tests",
"//src/test/java/com/google/devtools/build/lib/profiler/callcounts:all_windows_tests",
"//src/test/java/com/google/devtools/build/lib/profiler/memory:all_windows_tests",
- "//src/test/java/com/google/devtools/build/lib/rules/android:all_windows_tests",
- "//src/test/java/com/google/devtools/build/lib/rules/apple:all_windows_tests",
- "//src/test/java/com/google/devtools/build/lib/rules/config:all_windows_tests",
- "//src/test/java/com/google/devtools/build/lib/rules/cpp:all_windows_tests",
- "//src/test/java/com/google/devtools/build/lib/rules/platform:all_windows_tests",
- "//src/test/java/com/google/devtools/build/lib/rules/repository:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules:all_windows_tests",
"//src/test/java/com/google/devtools/build/lib/shell:all_windows_tests",
"//src/test/java/com/google/devtools/build/lib/skyframe:all_windows_tests",
"//src/test/java/com/google/devtools/build/lib/skylark:all_windows_tests",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/BUILD b/src/test/java/com/google/devtools/build/lib/rules/BUILD
new file mode 100644
index 0000000..1625dbf
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/BUILD
@@ -0,0 +1,79 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]) + [
+ "//src/test/java/com/google/devtools/build/lib/rules/android:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/apple:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/config:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/cpp:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/filegroup:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/genquery:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/java:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/objc:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/platform:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/proto:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/python:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/repository:srcs",
+ "//src/test/java/com/google/devtools/build/lib/rules/test:srcs",
+ ],
+)
+
+java_test(
+ name = "rules_tests",
+ srcs = glob(["*.java"]),
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//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:TestConstants",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/android:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/apple:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/config:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/cpp:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/filegroup:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/genquery:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/objc:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/platform:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/proto:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/python:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/repository:all_windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/test:all_windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
index 3e385b4..8d662b8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
@@ -9,7 +9,6 @@
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
java_test(
@@ -24,7 +23,6 @@
"//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
"//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -53,7 +51,6 @@
deps = [
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
- "//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//third_party:junit4",
"//third_party:truth",
],
@@ -64,10 +61,28 @@
srcs = ["AndroidCommonTest.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib:android-rules",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:syntax",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "AndroidBuildViewTestCase",
+ srcs = ["AndroidBuildViewTestCase.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:android-rules",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/main/protobuf:android_deploy_info_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/rules/java:java_compile_action_test_helper",
+ "//third_party:guava",
+ "//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
],
@@ -75,29 +90,25 @@
java_test(
name = "AndroidBinaryTest",
- size = "large",
+ timeout = "long",
srcs = ["AndroidBinaryTest.java"],
shard_count = 5,
deps = [
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:syntax",
- "//src/main/java/com/google/devtools/build/lib:util",
+ "//src/main/java/com/google/devtools/build/lib:filetype",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/protobuf:android_deploy_info_java_proto",
- "//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper",
"//src/test/java/com/google/devtools/build/lib/actions/util",
- "//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/rules/java:java_compile_action_test_helper",
"//src/test/java/com/google/devtools/build/lib/testutil",
"//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
@@ -113,13 +124,6 @@
":ResourceTestBase",
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/test/java/com/google/devtools/build/lib/testutil",
- "//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
],
@@ -132,13 +136,9 @@
":ResourceTestBase",
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:events",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/packages",
- "//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/packages:testutil",
- "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -154,7 +154,6 @@
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//third_party:guava",
"//third_party:junit4",
@@ -175,7 +174,6 @@
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/packages",
"//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",
"//third_party:guava",
"//third_party:junit4",
@@ -190,13 +188,7 @@
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/packages",
"//src/test/java/com/google/devtools/build/lib/actions/util",
- "//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",
- "//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
],
@@ -209,11 +201,7 @@
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib/actions",
"//src/test/java/com/google/devtools/build/lib/actions/util",
- "//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",
"//third_party:junit4",
"//third_party:truth",
],
@@ -228,13 +216,7 @@
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/collect",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/test/java/com/google/devtools/build/lib/actions/util",
- "//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",
- "//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
],
@@ -242,46 +224,19 @@
java_test(
name = "AndroidLibraryTest",
- timeout = "long",
srcs = ["AndroidLibraryTest.java"],
+ shard_count = 5,
deps = [
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:events",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
- "//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:java_compile_action_test_helper",
"//src/test/java/com/google/devtools/build/lib/actions/util",
- "//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/packages:testutil",
- "//third_party:guava",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-java_library(
- name = "AndroidBuildViewTestCase",
- testonly = 1,
- srcs = ["AndroidBuildViewTestCase.java"],
- deps = [
- "//src/main/java/com/google/devtools/build/lib:android-rules",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
- "//src/main/protobuf:android_deploy_info_java_proto",
- "//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
- "//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/rules/java:java_compile_action_test_helper",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -303,21 +258,16 @@
],
)
-java_test(
- name = "AndroidBinaryMultidexTest",
- srcs = [
- "AndroidBinaryMultidexTest.java",
- "AndroidMultidexBaseTest.java",
- ],
+java_library(
+ name = "AndroidMultidexBaseTest",
+ srcs = ["AndroidMultidexBaseTest.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -325,6 +275,16 @@
)
java_test(
+ name = "AndroidBinaryMultidexTest",
+ srcs = ["AndroidBinaryMultidexTest.java"],
+ deps = [
+ ":AndroidMultidexBaseTest",
+ "//src/main/java/com/google/devtools/build/lib:android-rules",
+ "//third_party:junit4",
+ ],
+)
+
+java_test(
name = "AndroidDataBindingTest",
srcs = ["AndroidDataBindingTest.java"],
deps = [
@@ -336,10 +296,29 @@
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
"//src/main/protobuf:extra_actions_base_java_proto",
- "//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper",
"//src/test/java/com/google/devtools/build/lib/actions/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/rules/java:java_compile_action_test_helper",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "AndroidDataBindingV2Test",
+ srcs = ["AndroidDataBindingV2Test.java"],
+ tags = ["manual"],
+ deps = [
+ ":AndroidBuildViewTestCase",
+ "//src/main/java/com/google/devtools/build/lib:android-rules",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/main/protobuf:extra_actions_base_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/rules/java:java_compile_action_test_helper",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -349,7 +328,6 @@
java_test(
name = "AndroidSdkTest",
srcs = ["AndroidSdkTest.java"],
- runtime_deps = ["//src/test/java/com/google/devtools/build/lib/testutil"],
deps = [
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
@@ -364,12 +342,8 @@
deps = [
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
"//src/test/java/com/google/devtools/build/lib/actions/util",
- "//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
],
@@ -383,12 +357,10 @@
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/rules/java:java-rules",
"//src/test/java/com/google/devtools/build/lib/actions/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",
@@ -400,13 +372,11 @@
java_test(
name = "AndroidDataConverterTest",
srcs = ["AndroidDataConverterTest.java"],
- runtime_deps = ["//src/test/java/com/google/devtools/build/lib/testutil"],
deps = [
"//src/main/java/com/google/devtools/build/lib:android-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//third_party:guava",
"//third_party:junit4",
@@ -420,7 +390,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -428,5 +397,4 @@
tests = [
":windows_tests",
],
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/BUILD b/src/test/java/com/google/devtools/build/lib/rules/apple/BUILD
index 173db68..c145059 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/BUILD
@@ -9,7 +9,6 @@
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
java_library(
@@ -17,11 +16,11 @@
srcs = glob(["*.java"]),
deps = [
"//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/actions",
"//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/rules/apple",
- "//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
"//src/main/protobuf:xcode_java_proto",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
"//src/test/java/com/google/devtools/build/lib/packages:testutil",
@@ -40,9 +39,7 @@
test_class = "com.google.devtools.build.lib.AllTests",
runtime_deps = [
":AppleRulesTests_lib",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
@@ -52,7 +49,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -60,5 +56,4 @@
tests = [
":windows_tests",
],
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
index acf7ac6..19409a1 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
@@ -9,7 +9,6 @@
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
# Description:
@@ -21,8 +20,6 @@
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/lib/collect",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/rules/config",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
@@ -35,7 +32,6 @@
"//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
"//third_party:guava",
"//third_party:guava-testlib",
- "//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
],
@@ -47,7 +43,6 @@
runtime_deps = [
":ConfigRulesTests_lib",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
@@ -57,7 +52,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -65,5 +59,4 @@
tests = [
":windows_tests",
],
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
index cd283f9..17a5f0a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -8,41 +8,41 @@
filegroup(
name = "srcs",
testonly = 0,
- srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+ srcs = glob(["*"]) + [
+ "//src/test/java/com/google/devtools/build/lib/rules/cpp/proto:srcs",
+ ],
)
-java_test(
- name = "cpp-rules-tests",
+java_library(
+ name = "CppRulesTests_lib",
srcs = glob(
["*.java"],
exclude = [
+ "CcBadDependenciesTest.java",
+ "LinkBuildVariablesTestCase.java",
+ "CcBinaryThinLtoTest.java",
+ "CcCompilationHelperTest.java",
"CcImportBaseConfiguredTargetTest.java",
+ "CppConfigurationSkylarkTest.java",
+ "CppSysrootTest.java",
+ "LinkCommandLineTest.java",
"SkylarkCcCommonTestHelper.java",
"NonWindowsCcBinaryThinLtoTest.java",
+ "SpawnGccStrategyTest.java",
],
- ) + ["proto/CcProtoLibraryTest.java"] + select({
- "//src/conditions:windows": [],
- "//conditions:default": ["NonWindowsCcBinaryThinLtoTest.java"],
- }),
+ ),
resources = [
"@rules_cc//cc:srcs",
],
- shard_count = 5,
- tags = ["rules"],
- test_class = "com.google.devtools.build.lib.AllTests",
- runtime_deps = [
- "//src/test/java/com/google/devtools/build/lib:test_runner",
- ],
deps = [
":CcImportBaseConfiguredTargetTest",
":SkylarkCcCommonTestHelper",
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
- "//src/main/java/com/google/devtools/build/lib:bazel-rules",
+ ":util",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:core-rules",
- "//src/main/java/com/google/devtools/build/lib:core-workspace-rules",
"//src/main/java/com/google/devtools/build/lib:events",
+ "//src/main/java/com/google/devtools/build/lib:filetype",
+ "//src/main/java/com/google/devtools/build/lib:os_util",
+ "//src/main/java/com/google/devtools/build/lib:string_util",
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/actions",
@@ -52,21 +52,17 @@
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/concurrent",
"//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/rules/apple",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
- "//src/main/java/com/google/devtools/build/lib/rules/platform",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
- "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp",
"//src/main/java/com/google/devtools/build/lib/util/io",
"//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/main/java/com/google/devtools/common/options",
- "//src/main/java/com/google/devtools/common/options:invocation_policy",
"//src/main/protobuf:crosstool_config_java_proto",
"//src/main/protobuf:extra_actions_base_java_proto",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
"//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
"//src/test/java/com/google/devtools/build/lib/exec/util",
@@ -77,8 +73,6 @@
"//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
"//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
"//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:jsr305",
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
@@ -93,19 +87,12 @@
],
deps = [
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
- "//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/protobuf:crosstool_config_java_proto",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
"//third_party:guava",
- "//third_party:guava-testlib",
- "//third_party:jsr305",
- "//third_party:junit4",
- "//third_party:truth",
- "//third_party/java/dd_plist",
"//third_party/protobuf:protobuf_java",
],
)
@@ -119,7 +106,6 @@
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
"//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//third_party:guava",
@@ -131,9 +117,146 @@
java_library(
name = "SkylarkCcCommonTestHelper",
srcs = ["SkylarkCcCommonTestHelper.java"],
+)
+
+java_test(
+ name = "CppRulesTests",
+ timeout = "long",
+ shard_count = 5,
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":CcImportBaseConfiguredTargetTest",
+ ":CppRulesTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+java_test(
+ name = "CppConfigurationSkylarkTest",
+ srcs = ["CppConfigurationSkylarkTest.java"],
deps = [
+ "//src/main/java/com/google/devtools/build/lib:syntax",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "CcCompilationHelperTest",
+ srcs = ["CcCompilationHelperTest.java"],
+ deps = [
+ ":CppRulesTests_lib",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "CppSysrootTest",
+ srcs = ["CppSysrootTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "CcBinaryThinLtoTest",
+ srcs = ["CcBinaryThinLtoTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "NonWindowsCcBinaryThinLtoTest",
+ srcs = ["NonWindowsCcBinaryThinLtoTest.java"],
+ tags = ["no_windows"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "CcBadDependenciesTest",
+ srcs = ["CcBadDependenciesTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//third_party:junit4",
+ ],
+)
+
+java_test(
+ name = "LinkCommandLineTest",
+ srcs = ["LinkCommandLineTest.java"],
+ deps = [
+ ":CppRulesTests_lib",
+ "//src/main/java/com/google/devtools/build/lib:util",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//src/main/protobuf:crosstool_config_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
"//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "SpawnGccStrategyTest",
+ srcs = ["SpawnGccStrategyTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:mockito",
+ "//third_party:truth",
],
)
@@ -143,13 +266,12 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
name = "all_windows_tests",
tests = [
":windows_tests",
+ "//src/test/java/com/google/devtools/build/lib/rules/cpp/proto:all_windows_tests",
],
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/BUILD
new file mode 100644
index 0000000..6b767ee
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/BUILD
@@ -0,0 +1,53 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+java_test(
+ name = "CcProtoLibraryTest",
+ srcs = ["CcProtoLibraryTest.java"],
+ resources = [
+ "@rules_cc//cc:srcs",
+ ],
+ tags = ["manual"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:bazel-rules-without-workspaces",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//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/rules/cpp",
+ "//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/actions/util",
+ "//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:TestConstants",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/filegroup/BUILD b/src/test/java/com/google/devtools/build/lib/rules/filegroup/BUILD
new file mode 100644
index 0000000..7675361
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/filegroup/BUILD
@@ -0,0 +1,52 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["**"]),
+)
+
+java_library(
+ name = "FilegroupTests_lib",
+ srcs = glob(["*.java"]),
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:filetype",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "FilegroupTests",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":FilegroupTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/genquery/BUILD b/src/test/java/com/google/devtools/build/lib/rules/genquery/BUILD
new file mode 100644
index 0000000..be0b98a
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/genquery/BUILD
@@ -0,0 +1,51 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["**"]),
+)
+
+java_test(
+ name = "genquery_tests",
+ srcs = glob(["*.java"]),
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:filetype",
+ "//src/main/java/com/google/devtools/build/lib:util",
+ "//src/main/java/com/google/devtools/build/lib/rules/genquery",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ "//third_party/protobuf:protobuf_java",
+ ],
+)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/BUILD b/src/test/java/com/google/devtools/build/lib/rules/java/BUILD
new file mode 100644
index 0000000..bb7a5ce
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/BUILD
@@ -0,0 +1,129 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["**"]),
+)
+
+java_test(
+ name = "JavaInfoSkylarkApiTest",
+ srcs = ["JavaInfoSkylarkApiTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//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/rules/java:java-compilation",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "JavaInfoTest",
+ srcs = ["JavaInfoTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "JavaRuntimeInfoTest",
+ srcs = ["JavaRuntimeInfoTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ ],
+)
+
+java_test(
+ name = "JavaSkylarkApiTest",
+ srcs = ["JavaSkylarkApiTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:filetype",
+ "//src/main/java/com/google/devtools/build/lib:syntax",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "JavaUtilTest",
+ srcs = ["JavaUtilTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "WriteBuildInfoPropertiesActionTest",
+ srcs = ["WriteBuildInfoPropertiesActionTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "java_compile_action_test_helper",
+ testonly = 1,
+ srcs = ["JavaCompileActionTestHelper.java"],
+ deps = [
+ "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:optionsparser",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
+ "//third_party:guava",
+ ],
+)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BUILD b/src/test/java/com/google/devtools/build/lib/rules/objc/BUILD
index bd35789..4373c9f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BUILD
@@ -5,20 +5,64 @@
default_visibility = ["//src:__subpackages__"],
)
+exports_files(["LICENSE"])
+
filegroup(
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+)
+
+java_test(
+ name = "BazelJ2ObjcLibraryTest",
+ srcs = ["BazelJ2ObjcLibraryTest.java"],
+ tags = ["no_windows"],
+ deps = [
+ ":J2ObjcLibraryTest",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/rules/apple",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/main/java/com/google/devtools/build/lib/rules/objc",
+ "//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/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "J2ObjcLibraryTest",
+ srcs = ["J2ObjcLibraryTest.java"],
+ deps = [
+ ":ObjcRulesTests_lib",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//third_party:junit4",
+ ],
)
java_library(
name = "ObjcRulesTests_lib",
- srcs = glob(["*.java"]),
+ srcs = glob(
+ ["*.java"],
+ exclude = [
+ "J2ObjcLibraryTest.java",
+ "BazelJ2ObjcLibraryTest.java",
+ ],
+ ),
deps = [
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:syntax",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
@@ -43,7 +87,6 @@
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
- "//third_party/java/dd_plist",
],
)
@@ -54,9 +97,7 @@
test_class = "com.google.devtools.build.lib.AllTests",
runtime_deps = [
":ObjcRulesTests_lib",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
@@ -66,7 +107,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -74,5 +114,4 @@
tests = [
":windows_tests",
],
- visibility = ["//src/test/java/com/google/devtools/build/lib/rules:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD b/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD
index b13ec78..913ef5d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD
@@ -9,7 +9,6 @@
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
TESTUTIL_SRCS = ["ToolchainTestCase.java"]
@@ -22,15 +21,32 @@
),
deps = [
"//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/analysis/platform",
"//src/main/java/com/google/devtools/build/lib/analysis/platform:utils",
"//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/skylarkbuildapi/platform",
- "//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
- "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "testutil",
+ srcs = TESTUTIL_SRCS,
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/skyframe",
+ "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
+ "//src/test/java/com/google/devtools/build/lib/skyframe:testutil",
+ "//src/test/java/com/google/devtools/build/lib/skylark:testutil",
+ "//third_party:guava",
+ "//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
],
@@ -45,31 +61,12 @@
],
)
-java_library(
- name = "testutil",
- srcs = TESTUTIL_SRCS,
- visibility = ["//src/test/java/com/google/devtools/build/lib:__subpackages__"],
- deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib/analysis/platform",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/skyframe",
- "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/test/java/com/google/devtools/build/lib/skyframe:testutil",
- "//src/test/java/com/google/devtools/build/lib/skylark:testutil",
- "//third_party:guava",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
test_suite(
name = "windows_tests",
tags = [
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -77,5 +74,4 @@
tests = [
":windows_tests",
],
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/BUILD b/src/test/java/com/google/devtools/build/lib/rules/proto/BUILD
new file mode 100644
index 0000000..adc92ae
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/BUILD
@@ -0,0 +1,105 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["**"]),
+)
+
+java_test(
+ name = "ProtoCompileActionBuilderTest",
+ srcs = ["ProtoCompileActionBuilderTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:events",
+ "//src/main/java/com/google/devtools/build/lib:proto-rules",
+ "//src/main/java/com/google/devtools/build/lib:util",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:mockito",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "ProtoLangToolchainTest",
+ srcs = ["ProtoLangToolchainTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:proto-rules",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//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:TestConstants",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "BazelProtoLibraryTest",
+ srcs = ["BazelProtoLibraryTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:proto-rules",
+ "//src/main/java/com/google/devtools/build/lib:util",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//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:TestConstants",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "BazelProtoInfoStarlarkTest",
+ srcs = ["BazelProtoInfoStarlarkTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//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/skylarkbuildapi/proto",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//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:TestConstants",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/BUILD b/src/test/java/com/google/devtools/build/lib/rules/python/BUILD
index ba9e5f2..3c81c25 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/python/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/python/BUILD
@@ -8,7 +8,7 @@
filegroup(
name = "srcs",
testonly = 0,
- srcs = glob(["**"]),
+ srcs = glob(["*"]),
)
test_suite(
@@ -98,6 +98,7 @@
java_test(
name = "PyBinaryConfiguredTargetTest",
srcs = ["PyBinaryConfiguredTargetTest.java"],
+ tags = ["no_windows"],
deps = [
":PyExecutableTestBase",
"//src/main/java/com/google/devtools/build/lib:build-base",
@@ -280,3 +281,18 @@
"//third_party:truth",
],
)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
index 31767d4..99bfacd 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
package(
default_testonly = 1,
@@ -9,41 +9,28 @@
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
-java_test(
- name = "RepositoryTests",
+java_library(
+ name = "RepositoryTests_lib",
srcs = glob(["*.java"]),
- tags = ["rules"],
- test_class = "com.google.devtools.build.lib.AllTests",
- runtime_deps = [
- "//src/test/java/com/google/devtools/build/lib:test_runner",
- ],
deps = [
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
"//src/main/java/com/google/devtools/build/lib:bazel-repository",
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib:syntax",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader",
"//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/pkgcache",
- "//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository",
- "//src/main/java/com/google/devtools/build/lib/unix",
"//src/main/java/com/google/devtools/build/lib/util/io",
"//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/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/test/java/com/google/devtools/build/lib/actions/util",
"//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:TestConstants",
"//third_party:guava",
@@ -51,7 +38,15 @@
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
- "//third_party/protobuf:protobuf_java",
+ ],
+)
+
+java_test(
+ name = "RepositoryTests",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":RepositoryTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
],
)
@@ -61,7 +56,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -69,5 +63,4 @@
tests = [
":windows_tests",
],
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/test/BUILD b/src/test/java/com/google/devtools/build/lib/rules/test/BUILD
new file mode 100644
index 0000000..e47dc49
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/rules/test/BUILD
@@ -0,0 +1,48 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["**"]),
+)
+
+java_library(
+ name = "TestRulesTests_lib",
+ srcs = glob(["*.java"]),
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "TestRulesTests",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":TestRulesTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+test_suite(
+ name = "windows_tests",
+ tags = [
+ "-no_windows",
+ "-slow",
+ ],
+)
+
+test_suite(
+ name = "all_windows_tests",
+ tests = [
+ ":windows_tests",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/BUILD b/src/test/java/com/google/devtools/build/lib/testutil/BUILD
index 664cf7b..64620c3 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/testutil/BUILD
@@ -40,7 +40,6 @@
"TimestampGranularityUtils.java",
"UnknownRuleConfiguredTarget.java",
],
- tags = ["avoid_dep"],
runtime_deps = ["//src/main/java/com/google/devtools/build/lib/unix"],
deps = [
":JunitUtils",
