Reorganize the Bazel testutils for lib/analysis/util, lib/buildtool/util and
lib/testutil, splitting each into two libraries, a //visibility:private one
containing code and visibility:public (ish) one being a direct export of the
private one. This new second library allows implementations to provide a
runtime_dep for the test implementation classes listed in
src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
TEST_* variables.
There are also a number of changes that move targtes out of build/lib/BUILD and
into subpackages with their own BUILD files.
RELNOTES: None.
PiperOrigin-RevId: 301592973
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD
index 706b35c..3c8e66e 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")
+load("//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps:tests.bzl", "create_golden_test")
# Description:
# Tests for the checker to check the completeness of the deps of java_import or aar_import targets.
@@ -40,7 +41,7 @@
srcs = ["LazyClassEntryStateTest.java"],
deps = [
"//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:import_deps_checker",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -76,7 +77,7 @@
test_class = "com.google.devtools.build.importdeps.ClassCacheTest",
deps = [
"//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:import_deps_checker",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -120,8 +121,6 @@
],
)
-load("//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps:tests.bzl", "create_golden_test")
-
create_golden_test(
name = "bootclasspath_missing_golden_test",
check_missing = True,
@@ -265,7 +264,7 @@
srcs = ["MainTest.java"],
deps = [
"//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:junit4",
"//third_party:truth",
],
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD
index ec3c1a1..2ddfd0f 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD
@@ -11,7 +11,8 @@
deps = [
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api",
- "//src/test/java/com/google/devtools/build/lib: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:junit4",
"//third_party:truth",
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
index 3c3e48b..41cf6a8 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
@@ -22,7 +22,9 @@
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/util",
- "//src/test/java/com/google/devtools/build/lib: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:TestUtils",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:jsr330_inject",
diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
index 367d3bc8..0e65c12 100644
--- a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
+++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
@@ -12,7 +12,9 @@
"//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:libSingleJar",
"//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:libSingleJarMain",
"//src/java_tools/singlejar/java/com/google/devtools/build/zip",
- "//src/test/java/com/google/devtools/build/lib: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:TestSuite",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
index 3181963..88c8c7f 100644
--- a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
+++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
@@ -10,7 +10,9 @@
srcs = glob(["*.java"]),
deps = [
"//src/java_tools/singlejar/java/com/google/devtools/build/zip",
- "//src/test/java/com/google/devtools/build/lib: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:TestSuite",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:junit4",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD
index 7f90019..fd2d151 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD
@@ -17,6 +17,9 @@
"SerializationDepsUtils.java",
],
),
+ runtime_deps = [
+ "//src/test/java/com/google/devtools/build/lib/vfs/util", # For FileSystem modules
+ ],
deps = [
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
diff --git a/src/test/java/com/google/devtools/build/android/BUILD b/src/test/java/com/google/devtools/build/android/BUILD
index 0f29396..ecec8be 100644
--- a/src/test/java/com/google/devtools/build/android/BUILD
+++ b/src/test/java/com/google/devtools/build/android/BUILD
@@ -201,7 +201,8 @@
size = "small",
srcs = ["DensitySpecificManifestProcessorTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
@@ -215,7 +216,8 @@
size = "small",
srcs = ["DensitySpecificResourceFilterTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:junit4",
@@ -228,7 +230,8 @@
size = "small",
srcs = ["DependencyAndroidDataTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
@@ -260,7 +263,8 @@
srcs = ["ParsedAndroidDataTest.java"],
deps = [
":test_utils",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//src/tools/android/java/com/google/devtools/build/android/resources",
"//third_party:android_common_25_0_0",
@@ -291,7 +295,8 @@
size = "small",
srcs = ["SerializedAndroidDataTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
@@ -305,7 +310,8 @@
size = "small",
srcs = ["UnvalidatedAndroidDataTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jimfs",
diff --git a/src/test/java/com/google/devtools/build/android/desugar/BUILD b/src/test/java/com/google/devtools/build/android/desugar/BUILD
index 5e835d1..dede1e9 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/BUILD
@@ -45,7 +45,8 @@
tags = ["no_windows"],
deps = [
":testdata_desugared", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -64,7 +65,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_twice", # Make tests run against twice-desugared library
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -100,7 +102,8 @@
deps = [
":desugar_testdata_with_synthetic_methods_with_lambda_names",
":separate",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -135,7 +138,8 @@
tags = ["no_windows"],
deps = [
":testdata_desugared", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -152,7 +156,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarObjectsRequireNonNullTest",
deps = [
":desugar_testdata_by_disabling_lambda_desugaring", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:jsr305",
@@ -171,7 +176,8 @@
tags = ["no_windows"],
deps = [
":testdata_desugared_java8", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -190,7 +196,8 @@
tags = ["no_windows"],
deps = [
":testdata_desugared_java8_like_in_android_studio", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -209,7 +216,8 @@
tags = ["no_windows"],
deps = [
":testdata_desugared_default_methods", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -229,7 +237,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarDefaultMethodsFunctionalTest",
deps = [
":testdata_desugared_default_methods_twice", # Make tests run against 2x desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -247,7 +256,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_like_in_android_studio", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -265,7 +275,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_with_multiple_inputs", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -283,7 +294,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_from_directory_to_jar", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -301,7 +313,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_from_directory_to_directory", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -319,7 +332,8 @@
test_class = "com.google.devtools.build.android.desugar.DesugarFunctionalTest",
deps = [
":testdata_desugared_with_classpath_directory", # Make tests run against desugared library
- "//src/test/java/com/google/devtools/build/lib: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",
@@ -416,7 +430,8 @@
size = "small",
srcs = ["Java7CompatibilityTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//third_party:asm",
@@ -441,7 +456,8 @@
":mocked_android_os_sdk_for_testing",
":testdata",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
@@ -468,7 +484,8 @@
":mocked_android_os_sdk_for_testing",
":testdata",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
@@ -496,7 +513,8 @@
":mocked_android_os_sdk_for_testing",
":testdata",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//src/tools/android/java/com/google/devtools/build/android/desugar/io",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
@@ -517,7 +535,8 @@
tags = ["no_windows"],
test_class = "com.google.devtools.build.android.desugar.DesugarMainClassTest",
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//third_party:guava",
"//third_party:junit4",
@@ -534,7 +553,8 @@
tags = ["no_windows"],
test_class = "com.google.devtools.build.android.desugar.DesugarMainClassTest",
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//third_party:guava",
"//third_party:junit4",
@@ -556,7 +576,7 @@
tags = ["no_windows"],
deps = [
":bytecode_type_printer",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//src/tools/android/java/com/google/devtools/build/android/desugar",
"//third_party:asm",
"//third_party:guava",
@@ -976,7 +996,8 @@
"mocked_android_os_sdk_for_testing",
":desugar_testdata_by_desugaring_try_with_resources",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1001,7 +1022,8 @@
"mocked_android_os_sdk_for_testing",
":desugar_testdata_by_desugaring_try_with_resources_twice", # the lib desugared twice
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1025,7 +1047,8 @@
":desugar_testdata_by_desugaring_try_with_resources",
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1049,7 +1072,8 @@
":desugar_testdata_by_desugaring_try_with_resources_twice", # the lib desugared twice.
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1073,7 +1097,8 @@
":desugar_testdata_by_desugaring_try_with_resources",
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
@@ -1097,7 +1122,8 @@
":desugar_testdata_by_desugaring_try_with_resources_twice", # the lib desugared twice.
":mocked_android_os_sdk_for_testing",
"//src/test/java/com/google/devtools/build/android/desugar/runtime:throwable_extension_test_utility",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:asm",
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD
index 60902b2..91712b5 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD
@@ -36,7 +36,8 @@
deps = [
":throwable_extension_test_utility",
"//src/test/java/com/google/devtools/build/android/desugar:mocked_android_os_sdk_for_testing",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
"//third_party:guava",
"//third_party:junit4",
@@ -57,7 +58,8 @@
deps = [
":throwable_extension_test_utility",
"//src/test/java/com/google/devtools/build/android/desugar:mocked_android_os_sdk_for_testing",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
"//third_party:guava",
"//third_party:junit4",
@@ -77,7 +79,8 @@
deps = [
":throwable_extension_test_utility",
"//src/test/java/com/google/devtools/build/android/desugar:mocked_android_os_sdk_for_testing",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/runtime:throwable_extension",
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
index fb8f749..4c564ab 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
@@ -27,7 +27,8 @@
"-Djacoco_agent_jar=$(location //src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:jacoco_agent_jar)",
],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:desugar_rule",
"//third_party:asm",
"//third_party:asm-tree",
diff --git a/src/test/java/com/google/devtools/build/android/dexer/BUILD b/src/test/java/com/google/devtools/build/android/dexer/BUILD
index 8fec1ee..30e9aaf 100644
--- a/src/test/java/com/google/devtools/build/android/dexer/BUILD
+++ b/src/test/java/com/google/devtools/build/android/dexer/BUILD
@@ -31,7 +31,8 @@
javacopts = ["-source 7 -target 7"], # we run this through dx for testing, so no lambdas!
resources = ["testresource.txt"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
"//src/tools/android/java/com/google/devtools/build/android/dexer",
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/android/xml/BUILD b/src/test/java/com/google/devtools/build/android/xml/BUILD
index cf49e9c..d160a0c 100644
--- a/src/test/java/com/google/devtools/build/android/xml/BUILD
+++ b/src/test/java/com/google/devtools/build/android/xml/BUILD
@@ -12,7 +12,8 @@
size = "small",
srcs = ["IdXmlResourceValueTest.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//src/tools/android/java/com/google/devtools/build/android/proto:resources_java_proto",
"//src/tools/android/java/com/google/devtools/build/android/resources",
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/BUILD b/src/test/java/com/google/devtools/build/android/ziputils/BUILD
index ae1fa6d..3e31386 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/BUILD
+++ b/src/test/java/com/google/devtools/build/android/ziputils/BUILD
@@ -19,7 +19,9 @@
tags = ["ziputils"],
test_class = "com.google.devtools.build.android.ziputils.AllTests",
deps = [
- "//src/test/java/com/google/devtools/build/lib: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:TestSuite",
"//src/tools/android/java/com/google/devtools/build/android/ziputils:ziputils_lib",
"//third_party:guava",
"//third_party:jsr305",
diff --git a/src/test/java/com/google/devtools/build/docgen/BUILD b/src/test/java/com/google/devtools/build/docgen/BUILD
index 5804147..8bc3167 100644
--- a/src/test/java/com/google/devtools/build/docgen/BUILD
+++ b/src/test/java/com/google/devtools/build/docgen/BUILD
@@ -22,7 +22,7 @@
runtime_deps = [
":documentation-failures-tests",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:junit4",
],
)
@@ -35,7 +35,8 @@
tags = ["docgen"],
deps = [
":documentation-tests",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
"//third_party:junit4",
],
)
@@ -52,8 +53,9 @@
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/skylarkinterface",
"//src/test/java/com/google/devtools/build/lib:syntax_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
"//src/test/java/com/google/devtools/build/lib/skylark: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:junit4",
"//third_party:truth",
@@ -80,8 +82,8 @@
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//src/main/java/com/google/devtools/build/lib/skylarkinterface",
"//src/test/java/com/google/devtools/build/lib:syntax_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
"//src/test/java/com/google/devtools/build/lib/skylark:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 81ab7a7..fbcf704 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -12,9 +12,6 @@
# These don't need to run on Windows, they merely use Windows- and case-insensitive path semantics.
CROSS_PLATFORM_WINDOWS_TESTS = [
"util/DependencySetWindowsTest.java",
- "vfs/PathFragmentWindowsTest.java",
- "vfs/RootedPathAndCasingTest.java",
- "vfs/WindowsPathTest.java",
]
# Tests for Windows-specific functionality that run on Windows.
@@ -33,18 +30,20 @@
filegroup(
name = "srcs",
srcs = glob(["**"]) + [
- "//src/test/java/com/google/devtools/build/lib/analysis/platform:srcs",
- "//src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor:srcs",
- "//src/test/java/com/google/devtools/build/lib/analysis/whitelisting:srcs",
+ "//src/test/java/com/google/devtools/build/lib/actions:srcs",
+ "//src/test/java/com/google/devtools/build/lib/analysis:srcs",
"//src/test/java/com/google/devtools/build/lib/bazel:srcs",
"//src/test/java/com/google/devtools/build/lib/blackbox:srcs",
"//src/test/java/com/google/devtools/build/lib/buildeventservice:srcs",
"//src/test/java/com/google/devtools/build/lib/buildeventstream:srcs",
"//src/test/java/com/google/devtools/build/lib/buildeventstream/transports:srcs",
"//src/test/java/com/google/devtools/build/lib/buildtool:srcs",
+ "//src/test/java/com/google/devtools/build/lib/events:srcs",
+ "//src/test/java/com/google/devtools/build/lib/exec:srcs",
+ "//src/test/java/com/google/devtools/build/lib/integration/util:srcs",
"//src/test/java/com/google/devtools/build/lib/metrics:srcs",
"//src/test/java/com/google/devtools/build/lib/outputfilter:srcs",
- "//src/test/java/com/google/devtools/build/lib/packages/util/mock:srcs",
+ "//src/test/java/com/google/devtools/build/lib/packages:srcs",
"//src/test/java/com/google/devtools/build/lib/profiler:srcs",
"//src/test/java/com/google/devtools/build/lib/profiler/callcounts:srcs",
"//src/test/java/com/google/devtools/build/lib/profiler/memory:srcs",
@@ -69,7 +68,9 @@
"//src/test/java/com/google/devtools/build/lib/skylarkinterface/processor:srcs",
"//src/test/java/com/google/devtools/build/lib/supplier:srcs",
"//src/test/java/com/google/devtools/build/lib/versioning:srcs",
+ "//src/test/java/com/google/devtools/build/lib/vfs:srcs",
"//src/test/java/com/google/devtools/build/lib/unsafe:srcs",
+ "//src/test/java/com/google/devtools/build/lib/testutil:srcs",
],
visibility = ["//src:__pkg__"],
)
@@ -85,99 +86,20 @@
],
)
-java_library(
- name = "testutil",
- testonly = 1,
- srcs = glob(
- ["testutil/*.java"],
- exclude = ["testutil/BazelPackageBuilderHelperForTesting.java"],
- ),
- visibility = ["//visibility:public"],
- deps = [
- ":guava_junit_truth",
- ":testutil/BazelPackageBuilderHelperForTesting",
- "//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:build-request-options",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:os_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",
- "//src/main/java/com/google/devtools/build/lib/clock",
- "//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/concurrent",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/packages:builder_factory_for_testing",
- "//src/main/java/com/google/devtools/build/lib/rules/cpp",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:BazelPackageLoader",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageLoader",
- "//src/main/java/com/google/devtools/build/lib/util/io",
- "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
- "//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:options_internal",
- "//src/main/protobuf:invocation_policy_java_proto",
- ],
-)
-
-java_library(
- name = "testutil/BazelPackageBuilderHelperForTesting",
- testonly = 0,
- srcs = ["testutil/BazelPackageBuilderHelperForTesting.java"],
- visibility = ["//visibility:public"],
- 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/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",
- "//third_party:guava",
- ],
-)
-
-java_library(
- name = "foundations_testutil",
- testonly = 1,
- srcs = glob([
- "vfs/util/*.java",
- "events/util/*.java",
- ]),
- deps = [
- ":guava_junit_truth",
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/clock",
- "//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/shell",
- "//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/util/io:out-err",
- "//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/build/lib/windows",
- ],
-)
-
-java_library(
+alias(
name = "test_runner",
+ actual = ":AllTests",
+ visibility = ["//src/test:__subpackages__"],
+)
+
+java_library(
+ name = "AllTests",
testonly = 1,
srcs = ["AllTests.java"],
- visibility = ["//src/test/java/com/google/devtools/build:__subpackages__"],
+ visibility = ["//src/test:__subpackages__"],
deps = [
- ":testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
"//third_party:junit4",
],
)
@@ -191,13 +113,18 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/cmdline:LabelValidator",
"//src/main/java/com/google/devtools/build/lib/syntax:frontend",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//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:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -211,10 +138,16 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib/concurrent",
+ "//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:TestThread",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -227,11 +160,15 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//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/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -244,9 +181,7 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/actions:commandline_item",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
@@ -257,7 +192,13 @@
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
"//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",
+ "//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",
"//third_party/protobuf:protobuf_java",
],
)
@@ -271,10 +212,7 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":actions_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":testutil",
+ ":AllTests",
"//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/actions:localhost_capacity",
@@ -284,41 +222,18 @@
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/common/options:options_internal",
"//src/main/protobuf:test_status_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/events: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:TestThread",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:auto_value",
- ],
-)
-
-java_test(
- name = "events_test",
- size = "small",
- srcs = glob(["events/*.java"]),
- tags = [
- "foundations",
- ],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
- "//src/main/java/com/google/devtools/build/lib/util/io",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- ],
-)
-
-java_test(
- name = "testutil_test",
- size = "small",
- srcs = glob(["testutil/*Test.java"]),
- tags = [
- "foundations",
- ],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -334,16 +249,22 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- ":vfs_symlink_aware_filesystem_test",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:string_util",
"//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/unix",
"//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/events: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:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs:SymlinkAwareFileSystemTest",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -366,9 +287,7 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:command-utils",
"//src/main/java/com/google/devtools/build/lib:exitcode-external",
"//src/main/java/com/google/devtools/build/lib:failure_detail_util",
@@ -387,6 +306,11 @@
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:failure_details_java_proto",
+ "//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",
"//third_party/protobuf:protobuf_java",
@@ -403,9 +327,7 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/util/io",
"//src/main/java/com/google/devtools/build/lib/util/io:out-err",
@@ -413,119 +335,13 @@
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
"//src/main/protobuf:bazel_flags_java_proto",
+ "//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",
- ],
-)
-
-java_test(
- name = "vfs_test",
- size = "large",
- srcs = glob(
- [
- "vfs/*.java",
- ],
- exclude = ALL_WINDOWS_TESTS,
- ),
- flaky = True,
- tags = [
- "foundations",
- "no_windows",
- ],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":guava_junit_truth",
- ":foundations_testutil",
- ":test_runner",
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:string_util",
- # TODO(laszlocsomor): remove the .../lib:unix this dependency, because
- # it prevents running the test on Windows.
- "//src/main/java/com/google/devtools/build/lib/unix",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/clock",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
- "//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",
- ],
-)
-
-java_library(
- name = "vfs_filesystem_test",
- testonly = 1,
- srcs = ["vfs/FileSystemTest.java"],
- visibility = ["//visibility:private"],
- deps = [
- ":guava_junit_truth",
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:util",
- # TODO(laszlocsomor): remove the .../lib:unix this dependency, because
- # it prevents running the test on Windows.
- "//src/main/java/com/google/devtools/build/lib/unix",
- "//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- ],
-)
-
-java_library(
- name = "vfs_symlink_aware_filesystem_test",
- testonly = 1,
- srcs = ["vfs/SymlinkAwareFileSystemTest.java"],
- visibility = ["//visibility:private"],
- deps = [
- ":guava_junit_truth",
- ":vfs_filesystem_test",
- "//src/main/java/com/google/devtools/build/lib:os_util",
- "//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",
- ],
-)
-
-java_test(
- name = "vfs_inmemoryfs_test",
- size = "medium",
- srcs = glob(["vfs/inmemoryfs/*.java"]),
- tags = [
- "foundations",
- ],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- ":vfs_symlink_aware_filesystem_test",
- "//src/main/java/com/google/devtools/build/lib/clock",
- "//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",
- ],
-)
-
-# Tests that exercise Windows-specific (or case-insensitive-filesystem specific) functionality.
-# These don't need to run on Windows, they merely use Windows- and case-insensitive path semantics.
-java_test(
- name = "windows_test",
- srcs = CROSS_PLATFORM_WINDOWS_TESTS + ["vfs/PathAbstractTest.java"],
- jvm_flags = [
- "-Dblaze.os=Windows",
- "-Dbazel.windows_unix_root=C:/fake/msys",
- ],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/clock",
- "//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/build/lib/windows",
- "//src/main/java/com/google/devtools/common/options",
+ "//third_party:truth",
],
)
@@ -536,11 +352,14 @@
"windows/util/WindowsTestUtil.java",
],
deps = [
- ":guava_junit_truth",
"//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/windows",
"//src/main/java/com/google/devtools/build/lib/windows/jni",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -557,9 +376,7 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
":windows_testutil",
"//src/main/java/com/google/devtools/build/lib:os_util",
"//src/main/java/com/google/devtools/build/lib/clock",
@@ -570,6 +387,11 @@
"//src/main/java/com/google/devtools/build/lib/windows",
"//src/main/java/com/google/devtools/build/lib/windows:windows_short_path",
"//src/main/java/com/google/devtools/build/lib/windows/jni",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
"@bazel_tools//tools/java/runfiles",
],
)
@@ -580,383 +402,6 @@
srcs = ["windows/printarg.cc"],
)
-java_library(
- name = "actions_testutil",
- testonly = 1,
- srcs = glob([
- "actions/util/*.java",
- ]),
- deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//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:events",
- "//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/clock",
- "//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/concurrent",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
- "//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/build/skyframe",
- "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/main/java/com/google/devtools/common/options",
- "//src/main/protobuf:action_cache_java_proto",
- "//third_party:jsr305",
- "//third_party:mockito",
- ],
-)
-
-java_test(
- name = "actions_test",
- srcs = glob([
- "actions/*.java",
- "actions/cache/*.java",
- ]),
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//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:events",
- "//src/main/java/com/google/devtools/build/lib:string_util",
- "//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/actions:localhost_capacity",
- "//src/main/java/com/google/devtools/build/lib/analysis/platform",
- "//src/main/java/com/google/devtools/build/lib/clock",
- "//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/concurrent",
- "//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/rules/java:java-rules",
- "//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/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/build/skyframe:skyframe-objects",
- "//src/main/java/com/google/devtools/common/options",
- "//src/main/protobuf:action_cache_java_proto",
- "//third_party:jsr305",
- "//third_party:mockito",
- "//third_party:truth",
- ],
-)
-
-java_library(
- name = "analysis_testutil",
- testonly = 1,
- srcs = glob(
- [
- "analysis/LicensingTests.java",
- "analysis/mock/BazelAnalysisMock.java",
- "analysis/util/*.java",
- "exec/util/*.java",
- ],
- allow_empty = True,
- exclude = ["analysis/util/DefaultBuildOptionsForTesting.java"],
- ),
- data = [
- "//tools/jdk:srcs",
- ],
- resources = [
- "analysis/mock/cc_toolchain_config.bzl",
- "//tools/build_defs/cc:action_names.bzl",
- "//tools/cpp:cc_toolchain_config_lib.bzl",
- ],
- tags = ["analysis"],
- exports = [
- "//src/test/java/com/google/devtools/build/skyframe:testutil",
- ],
- deps = [
- ":actions_testutil",
- ":default_test_build_rules",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:android-rules",
- "//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:bazel-rules",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:build-request-options",
- "//src/main/java/com/google/devtools/build/lib:core-rules",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:keep-going-option",
- "//src/main/java/com/google/devtools/build/lib:loading-phase-threads-option",
- "//src/main/java/com/google/devtools/build/lib:proto-rules",
- "//src/main/java/com/google/devtools/build/lib:python-rules",
- "//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/actions:localhost_capacity",
- "//src/main/java/com/google/devtools/build/lib/analysis/platform",
- "//src/main/java/com/google/devtools/build/lib/causes",
- "//src/main/java/com/google/devtools/build/lib/clock",
- "//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/concurrent",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
- "//src/main/java/com/google/devtools/build/lib/pkgcache",
- "//src/main/java/com/google/devtools/build/lib/query2",
- "//src/main/java/com/google/devtools/build/lib/query2/query/output",
- "//src/main/java/com/google/devtools/build/lib/rules/apple",
- "//src/main/java/com/google/devtools/build/lib/rules/apple/swift",
- "//src/main/java/com/google/devtools/build/lib/rules/config",
- "//src/main/java/com/google/devtools/build/lib/rules/cpp",
- "//src/main/java/com/google/devtools/build/lib/rules/genquery",
- "//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/rules/objc",
- "//src/main/java/com/google/devtools/build/lib/rules/platform",
- "//src/main/java/com/google/devtools/build/lib/shell",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:BazelPackageLoader",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageLoader",
- "//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/main/java/com/google/devtools/common/options",
- "//src/main/java/com/google/devtools/common/options:invocation_policy",
- "//src/main/protobuf:extra_actions_base_java_proto",
- "//src/test/java/com/google/devtools/build/lib/skyframe:testutil",
- "//src/test/java/com/google/devtools/build/skyframe:testutil",
- "//third_party:jsr305",
- "//third_party:mockito",
- "//third_party/protobuf:protobuf_java",
- "@bazel_tools//tools/java/runfiles",
- ],
-)
-
-java_library(
- name = "default_test_build_rules",
- testonly = 1,
- srcs = ["analysis/util/DefaultBuildOptionsForTesting.java"],
- deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/common/options",
- ],
-)
-
-java_library(
- name = "integration_testutil",
- testonly = 1,
- srcs = glob([
- "integration/util/*.java",
- ]),
- deps = [
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- ],
-)
-
-java_test(
- name = "analysis_actions_test",
- srcs = glob([
- "analysis/actions/*.java",
- ]),
- tags = ["analysis"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//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:events",
- "//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/skyframe/serialization",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils:depsutils",
- "//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/protobuf:extra_actions_base_java_proto",
- "//third_party:jsr305",
- "//third_party:mockito",
- ],
-)
-
-java_test(
- name = "analysis_config_test",
- srcs = glob([
- "analysis/config/**/*.java",
- ]),
- tags = ["analysis"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:android-rules",
- "//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:proto-rules",
- "//src/main/java/com/google/devtools/build/lib:python-rules",
- "//src/main/java/com/google/devtools/build/lib:util",
- "//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/rules/java:java-compilation",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules",
- "//src/main/java/com/google/devtools/build/lib/rules/objc",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
- "//src/main/java/com/google/devtools/build/lib/skyframe/trimming:trimmed_configuration_cache",
- "//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
- "//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/common/options",
- "//src/main/protobuf:extra_actions_base_java_proto",
- "//src/test/java/com/google/devtools/build/lib/skyframe/trimming:trimmable_test_fragments",
- "//third_party:auto_value",
- "//third_party:jsr305",
- "//third_party:mockito",
- ],
-)
-
-java_test(
- name = "analysis_constraints_test",
- srcs = glob([
- "analysis/constraints/*.java",
- ]),
- tags = ["analysis"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//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/cmdline",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- ],
-)
-
-java_test(
- name = "analysis_select_test",
- srcs = glob([
- "analysis/select/*.java",
- ]),
- tags = ["analysis"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
- ":test_runner",
- ":testutil",
- "//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/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/vfs:pathfragment",
- ],
-)
-
-java_test(
- name = "analysis_test",
- srcs = glob([
- "analysis/*.java",
- ]),
- shard_count = 6,
- tags = [
- "analysis",
- "no_windows",
- ],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
- ":test_runner",
- ":testutil",
- "//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:events",
- "//src/main/java/com/google/devtools/build/lib:python-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/analysis/platform",
- "//src/main/java/com/google/devtools/build/lib/buildeventstream",
- "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
- "//src/main/java/com/google/devtools/build/lib/causes",
- "//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/pkgcache",
- "//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/rules/java:java-rules",
- "//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/skyframe/serialization/testutils:depsutils",
- "//src/main/java/com/google/devtools/build/lib/skylarkinterface",
- "//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
- "//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/build/skyframe",
- "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/main/java/com/google/devtools/common/options:options_internal",
- "//src/test/java/com/google/devtools/build/lib/rules/platform:testutil",
- "//src/test/java/com/google/devtools/build/lib/skyframe:testutil",
- "//third_party:auto_value",
- "//third_party:jsr305",
- "//third_party:mockito",
- ],
-)
-
java_test(
name = "graph_test",
srcs = glob([
@@ -964,115 +409,19 @@
]),
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:events",
"//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/graph",
"//src/main/java/com/google/devtools/build/lib/packages",
- ],
-)
-
-java_library(
- name = "packages_testutil",
- testonly = 1,
- srcs = glob([
- "packages/util/*.java",
- ]),
- resources = [
- "//src/test/java/com/google/devtools/build/lib/packages/util/mock:android_cc_toolchain_config.bzl",
- "//src/test/java/com/google/devtools/build/lib/packages/util/mock:osx_cc_toolchain_config.bzl",
- "//tools/build_defs/cc:action_names.bzl",
- "//tools/python:srcs",
- "@rules_cc//cc:srcs",
- ],
- deps = [
- ":default_test_build_rules",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":testutil",
- "//src/main/java/com/google/devtools/build/docgen:docgen_javalib",
- "//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:events",
- "//src/main/java/com/google/devtools/build/lib:proto-rules",
- "//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/clock",
- "//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/packages:starlark_semantics_options",
- "//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/skyframe/packages:BazelPackageLoader",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
- "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageLoader",
- "//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/build/skyframe",
- "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/main/java/com/google/devtools/common/options",
- "//src/main/java/com/google/devtools/common/options:invocation_policy",
- "//src/main/protobuf:build_java_proto",
- "//src/main/protobuf:crosstool_config_java_proto",
- "//src/main/protobuf:extra_actions_base_java_proto",
- "//third_party:jsr305",
- "//third_party:mockito",
- "//third_party/protobuf:protobuf_java",
- ],
-)
-
-java_test(
- name = "packages_test",
- srcs = glob(
- [
- "packages/*.java",
- ],
- exclude = [
- "packages/BazelDocumentationTest.java",
- ],
- ),
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
- ":test_runner",
- ":testutil",
- "//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:events",
- "//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",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
- "//src/main/java/com/google/devtools/build/lib/pkgcache",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
- "//src/main/java/com/google/devtools/build/lib/skylarkinterface",
- "//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/main/java/com/google/devtools/common/options:options_internal",
- "//src/main/protobuf:build_java_proto",
- "//third_party:jsr305",
- "//third_party:mockito",
- "//third_party/protobuf:protobuf_java",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -1085,12 +434,7 @@
),
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":analysis_testutil",
- ":default_test_build_rules",
- ":guava_junit_truth",
- ":packages_testutil",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//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:events",
@@ -1110,7 +454,17 @@
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/main/java/com/google/devtools/common/options",
"//src/main/java/com/google/devtools/common/options:invocation_policy",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util:test-build-options",
+ "//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:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -1125,10 +479,7 @@
],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:bazel-main",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib:server",
@@ -1144,8 +495,18 @@
"//src/main/protobuf:command_server_java_proto",
"//src/main/protobuf:failure_details_java_proto",
"//src/main/protobuf:invocation_policy_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/events: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:TestThread",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
"//third_party:jsr305",
+ "//third_party:junit4",
"//third_party:mockito",
+ "//third_party:truth",
"//third_party/grpc:grpc-jar",
"//third_party/protobuf:protobuf_java",
],
@@ -1159,11 +520,8 @@
),
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
+ ":AllTests",
":syntax_testutil",
- ":test_runner",
- ":testutil",
"//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",
@@ -1183,29 +541,15 @@
"//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/common/options:options_internal",
+ "//src/test/java/com/google/devtools/build/lib/events: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/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
"//third_party:jsr305",
- ],
-)
-
-java_test(
- name = "BazelDocumentationTests",
- size = "medium",
- srcs = ["packages/BazelDocumentationTest.java"],
- data = [
- "//site:docs/user-manual.html",
- ],
- test_class = "com.google.devtools.build.lib.packages.BazelDocumentationTest",
- deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
- ":windows_testutil",
- "//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:os_util",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//third_party:jsr305",
- "@bazel_tools//tools/java/runfiles",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -1217,10 +561,7 @@
]),
visibility = ["//visibility:public"],
deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":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",
@@ -1235,7 +576,14 @@
"//src/main/java/com/google/devtools/build/lib/syntax:frontend",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/common/options:options_internal",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
"//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
],
)
@@ -1245,10 +593,7 @@
tags = ["rules"],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":guava_junit_truth",
- ":testutil",
+ ":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",
@@ -1256,7 +601,15 @@
"//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",
],
)
@@ -1283,11 +636,8 @@
tags = ["rules"],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":guava_junit_truth",
+ ":AllTests",
":java_compile_action_test_helper",
- ":testutil",
"//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",
@@ -1302,7 +652,15 @@
"//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",
],
)
@@ -1312,9 +670,12 @@
tags = ["rules"],
test_class = "com.google.devtools.build.lib.rules.test.SkylarkTestingModuleTest",
deps = [
- ":analysis_testutil",
- ":guava_junit_truth",
"//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",
],
)
@@ -1330,11 +691,7 @@
),
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":actions_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:bazel-modules",
"//src/main/java/com/google/devtools/build/lib:bazel-rules",
"//src/main/java/com/google/devtools/build/lib:build-base",
@@ -1370,10 +727,21 @@
"//src/main/protobuf:command_line_java_proto",
"//src/main/protobuf:invocation_policy_java_proto",
"//src/main/protobuf:test_status_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
"//src/test/java/com/google/devtools/build/lib/skylark: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",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//src/test/java/com/google/devtools/common/options:testutils",
"//third_party:apache_commons_lang",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
"//third_party:mockito",
+ "//third_party:truth",
],
)
@@ -1390,12 +758,7 @@
data = [":embedded_scripts"],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":integration_testutil",
- ":testutil",
+ ":AllTests",
"//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:events",
@@ -1414,73 +777,19 @@
"//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/common/options",
- "//third_party:mockito",
- ],
-)
-
-java_test(
- name = "exec-tests",
- srcs = glob(["exec/*.java"]),
- tags = ["exec"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
- "//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:events",
- "//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/actions:localhost_capacity",
- "//src/main/java/com/google/devtools/build/lib/analysis/platform",
- "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
- "//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/remote/options",
- "//src/main/java/com/google/devtools/build/lib/shell",
- "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
- "//src/main/java/com/google/devtools/build/lib/util/io",
- "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
- "//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/main/java/com/google/devtools/build/lib/vfs:output_service",
- "//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/protobuf:spawn_java_proto",
- "//src/main/protobuf:test_status_java_proto",
- "//third_party:mockito",
- "//third_party/protobuf:protobuf_java",
- ],
-)
-
-java_test(
- name = "exec-local-tests",
- srcs = glob(["exec/local/*.java"]),
- tags = ["exec"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":analysis_testutil",
- ":guava_junit_truth",
- ":testutil",
- "//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/actions:localhost_capacity",
- "//src/main/java/com/google/devtools/build/lib/exec/local",
- "//src/main/java/com/google/devtools/build/lib/exec/local:options",
- "//src/main/java/com/google/devtools/build/lib/shell",
- "//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/lib/vfs/inmemoryfs",
- "//src/main/java/com/google/devtools/common/options",
- "//src/main/tools:process-wrapper",
- "//src/test/shell/integration:spend_cpu_time",
+ "//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/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/exec/util",
+ "//src/test/java/com/google/devtools/build/lib/integration/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:TestConstants",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
],
@@ -1490,9 +799,6 @@
name = "ProtoCompileActionBuilderTest",
srcs = ["rules/proto/ProtoCompileActionBuilderTest.java"],
deps = [
- ":actions_testutil",
- ":guava_junit_truth",
- ":testutil",
"//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",
@@ -1504,7 +810,14 @@
"//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",
],
)
@@ -1512,15 +825,19 @@
name = "ProtoLangToolchainTest",
srcs = ["rules/proto/ProtoLangToolchainTest.java"],
deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
"//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:testutil",
+ "//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",
],
)
@@ -1528,17 +845,22 @@
name = "BazelProtoLibraryTest",
srcs = ["rules/proto/BazelProtoLibraryTest.java"],
deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
"//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:testutil",
+ "//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",
],
)
@@ -1546,10 +868,6 @@
name = "BazelProtoInfoStarlarkTest",
srcs = ["rules/proto/BazelProtoInfoStarlarkTest.java"],
deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
"//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",
@@ -1557,7 +875,16 @@
"//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:testutil",
+ "//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",
],
)
@@ -1566,7 +893,7 @@
srcs = glob(["repository/*.java"]),
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":analysis_testutil",
+ ":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:syntax",
@@ -1579,6 +906,8 @@
"//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/analysis/util",
+ "//src/test/java/com/google/devtools/build/skyframe:testutil",
"//third_party:auto_value",
"//third_party:guava",
"//third_party:truth",
@@ -1590,11 +919,7 @@
srcs = glob(["rules/*.java"]),
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":actions_testutil",
- ":analysis_testutil",
- ":guava_junit_truth",
- ":packages_testutil",
- ":testutil",
+ ":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",
@@ -1608,7 +933,16 @@
"//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",
],
)
@@ -1617,10 +951,7 @@
srcs = glob(["worker/*Test.java"]),
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
- ":foundations_testutil",
- ":guava_junit_truth",
- ":test_runner",
- ":testutil",
+ ":AllTests",
"//src/main/java/com/google/devtools/build/lib:os_util",
"//src/main/java/com/google/devtools/build/lib:resource-converter",
"//src/main/java/com/google/devtools/build/lib:util",
@@ -1632,14 +963,11 @@
"//src/main/java/com/google/devtools/build/lib/worker",
"//src/main/java/com/google/devtools/common/options:options_internal",
"//src/main/protobuf:worker_protocol_java_proto",
- ],
-)
-
-java_library(
- name = "guava_junit_truth",
- testonly = 1,
- visibility = ["//visibility:private"],
- exports = [
+ "//src/test/java/com/google/devtools/build/lib/events: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:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:junit4",
@@ -1690,12 +1018,9 @@
TEST_SUITES = [
"ziputils",
"rules",
- "analysis",
- "foundations",
"shell",
"server",
"skyframe",
- "exec",
]
[
@@ -1707,6 +1032,33 @@
]
test_suite(
+ name = "exec",
+ tests = [
+ "//src/test/java/com/google/devtools/build/lib/exec:ExecTests",
+ "//src/test/java/com/google/devtools/build/lib/exec/local:ExecLocalTests",
+ ],
+)
+
+test_suite(
+ name = "foundations",
+ tests = [
+ ":cmdline_test",
+ ":collect_nestedset_test",
+ ":collect_test",
+ ":concurrent_test",
+ "//src/test/java/com/google/devtools/build/lib/events:EventsTests",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtilTests",
+ ],
+)
+
+test_suite(
+ name = "analysis",
+ tests = [
+ "//src/test/java/com/google/devtools/build/lib/analysis:AllAnalysisTests",
+ ],
+)
+
+test_suite(
name = "others",
tags = ["-" + n for n in TEST_SUITES],
)
diff --git a/src/test/java/com/google/devtools/build/lib/actions/BUILD b/src/test/java/com/google/devtools/build/lib/actions/BUILD
new file mode 100644
index 0000000..a1e6f36
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/actions/BUILD
@@ -0,0 +1,73 @@
+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([
+ "*",
+ "cache/*",
+ ]) + [
+ "//src/test/java/com/google/devtools/build/lib/actions/util:srcs",
+ ],
+)
+
+java_library(
+ name = "ActionsTests_lib",
+ srcs = glob(
+ [
+ "*.java",
+ "cache/*.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:string_util",
+ "//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/actions:localhost_capacity",
+ "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//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/concurrent",
+ "//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/skyframe/serialization",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
+ "//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/build/skyframe:skyframe-objects",
+ "//src/main/java/com/google/devtools/common/options",
+ "//src/main/protobuf:action_cache_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/events: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:TestThread",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:mockito",
+ "//third_party:truth",
+ "//third_party/protobuf:protobuf_java",
+ ],
+)
+
+java_test(
+ name = "ActionsTests",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":ActionsTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/BUILD b/src/test/java/com/google/devtools/build/lib/actions/util/BUILD
new file mode 100644
index 0000000..bad4b43
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/BUILD
@@ -0,0 +1,41 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+java_library(
+ name = "util",
+ srcs = glob(["*.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:filetype",
+ "//src/main/java/com/google/devtools/build/lib:resource_usage",
+ "//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/clock",
+ "//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/skyframe/serialization/autocodec",
+ "//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/build/skyframe",
+ "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
+ "//src/main/java/com/google/devtools/common/options",
+ "//src/main/protobuf:action_cache_java_proto",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:truth",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/BUILD
new file mode 100644
index 0000000..d623762
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BUILD
@@ -0,0 +1,220 @@
+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(["**"]) + [
+ "//src/test/java/com/google/devtools/build/lib/analysis/mock:srcs",
+ "//src/test/java/com/google/devtools/build/lib/analysis/platform:srcs",
+ "//src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor:srcs",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util:srcs",
+ "//src/test/java/com/google/devtools/build/lib/analysis/whitelisting:srcs",
+ ],
+)
+
+java_library(
+ name = "AnalysisTests_lib",
+ testonly = 1,
+ srcs = glob(
+ include = ["**/*.java"],
+ exclude = [
+ "AbstractConfiguredTargetTest.java",
+ "AnalysisUtilsTest.java",
+ "CachingTest.java",
+ "ConfiguredTargetTransitivePackagesTest.java",
+ "GeneratorConflictTest.java",
+ "PackageGroupBuildViewTest.java",
+ "RuleConfiguredTargetTest.java",
+ "SourceManifestActionTest.java",
+ ],
+ ),
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:android-rules",
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//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:proto-rules",
+ "//src/main/java/com/google/devtools/build/lib:python-rules",
+ "//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/buildeventstream",
+ "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
+ "//src/main/java/com/google/devtools/build/lib/causes",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//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/pkgcache",
+ "//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/skyframe/serialization/autocodec",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils:depsutils",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/trimming:trimmed_configuration_cache",
+ "//src/main/java/com/google/devtools/build/lib/skylarkinterface",
+ "//src/main/java/com/google/devtools/build/lib/util/io",
+ "//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/build/skyframe:skyframe-objects",
+ "//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/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/exec/util",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//src/test/java/com/google/devtools/build/lib/rules/platform:testutil",
+ "//src/test/java/com/google/devtools/build/lib/skyframe:testutil",
+ "//src/test/java/com/google/devtools/build/lib/skyframe/trimming:trimmable_test_fragments",
+ "//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",
+ "//src/test/java/com/google/devtools/build/skyframe:testutil",
+ "//third_party:auto_value",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:mockito",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "AnalysisTests",
+ shard_count = 12,
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":AnalysisTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+java_test(
+ name = "AnalysisUtilsTest",
+ srcs = ["AnalysisUtilsTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//third_party:auto_value",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "AbstractConfiguredTargetTest",
+ srcs = ["AbstractConfiguredTargetTest.java"],
+ deps = [
+ "//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",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "CachingTest",
+ srcs = ["CachingTest.java"],
+ deps = [
+ "//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/analysis/util",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "ConfiguredTargetTransitivePackagesTest",
+ srcs = ["ConfiguredTargetTransitivePackagesTest.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/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/skyframe:testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "SourceManifestActionTest",
+ srcs = ["SourceManifestActionTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib:python-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/collect/nestedset",
+ "//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",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "RuleConfiguredTargetTest",
+ srcs = ["RuleConfiguredTargetTest.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/actions",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "PackageGroupBuildViewTest",
+ srcs = ["PackageGroupBuildViewTest.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 = "GeneratorConflictTest",
+ srcs = ["GeneratorConflictTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//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",
+ ],
+)
+
+test_suite(
+ name = "AllAnalysisTests",
+ tests = [
+ ":AbstractConfiguredTargetTest",
+ ":AnalysisTests",
+ ":AnalysisUtilsTest",
+ ":CachingTest",
+ ":ConfiguredTargetTransitivePackagesTest",
+ ":GeneratorConflictTest",
+ ":PackageGroupBuildViewTest",
+ ":RuleConfiguredTargetTest",
+ ":SourceManifestActionTest",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/mock/BUILD
new file mode 100644
index 0000000..345cf54
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BUILD
@@ -0,0 +1,49 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+java_library(
+ name = "mock",
+ srcs = glob([
+ "*.java",
+ ]),
+ data = [
+ "//tools/jdk:srcs",
+ ],
+ resources = [
+ "cc_toolchain_config.bzl",
+ "//tools/build_defs/cc:action_names.bzl",
+ "//tools/cpp:cc_toolchain_config_lib.bzl",
+ ],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:android-rules",
+ "//src/main/java/com/google/devtools/build/lib:bazel-repository",
+ "//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:proto-rules",
+ "//src/main/java/com/google/devtools/build/lib:python-rules",
+ "//src/main/java/com/google/devtools/build/lib/rules/apple",
+ "//src/main/java/com/google/devtools/build/lib/rules/apple/swift",
+ "//src/main/java/com/google/devtools/build/lib/rules/config",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules",
+ "//src/main/java/com/google/devtools/build/lib/rules/objc",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util:util_internal",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//third_party:guava",
+ "@bazel_tools//tools/java/runfiles",
+ ],
+)
+
+exports_files(["cc_toolchain_config.bzl"])
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
index f57e411..a1e890d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
@@ -8,32 +8,29 @@
filegroup(
name = "srcs",
testonly = 0,
- srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+ srcs = glob(["*"]),
)
java_test(
name = "PlatformAnalysisTests",
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:events",
- "//src/main/java/com/google/devtools/build/lib:os_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",
"//src/main/java/com/google/devtools/build/lib/analysis/platform",
"//src/main/java/com/google/devtools/build/lib/analysis/platform:platform_utils",
"//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/remote/options",
- "//src/main/java/com/google/devtools/common/options:options_internal",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/skylark:testutil",
+ "//src/main/java/com/google/devtools/common/options",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/exec/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:junit4",
@@ -48,7 +45,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -56,5 +52,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/analysis/skylark/annotations/processor/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD
index 26519d7..b0d8284 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD
@@ -1,25 +1,23 @@
load("@rules_java//java:defs.bzl", "java_test")
-licenses(["notice"]) # Apache 2.0
+package(
+ default_visibility = ["//src:__subpackages__"],
+)
filegroup(
name = "srcs",
- srcs = glob(
- ["**"],
- ),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+ srcs = glob(["**"]),
)
java_test(
name = "SkylarkConfigurationFieldProcessorTest",
srcs = ["SkylarkConfigurationFieldProcessorTest.java"],
resources = [":ProcessorTestFiles"],
- deps = [
+ runtime_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/analysis/skylark/annotations",
+ ],
+ deps = [
"//src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor:annotation_preprocessor",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
"//third_party:compile_testing",
"//third_party:guava",
"//third_party:junit4",
@@ -38,7 +36,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -46,5 +43,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/analysis/util/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
new file mode 100644
index 0000000..fdceef1
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
@@ -0,0 +1,85 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+# Redirection for util lib to allow exporting both ":util_internal" and the
+# implementation of AnalysisMock as named in
+# src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+java_library(
+ name = "util",
+ exports = [
+ ":util_internal",
+ ],
+ runtime_deps = ["//src/test/java/com/google/devtools/build/lib/analysis/mock"],
+)
+
+java_library(
+ name = "util_internal",
+ srcs = glob(
+ [
+ "*.java",
+ ],
+ exclude = ["DefaultBuildOptionsForTesting.java"],
+ ),
+ deps = [
+ ":test-build-options",
+ "//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:build-request-options",
+ "//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:keep-going-option",
+ "//src/main/java/com/google/devtools/build/lib:loading-phase-threads-option",
+ "//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",
+ "//src/main/java/com/google/devtools/build/lib/causes",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//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/concurrent",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
+ "//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/rules/java:java-compilation",
+ "//src/main/java/com/google/devtools/build/lib/shell",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
+ "//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/main/java/com/google/devtools/common/options",
+ "//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/skyframe: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",
+ "//src/test/java/com/google/devtools/build/skyframe:testutil",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "test-build-options",
+ srcs = ["DefaultBuildOptionsForTesting.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/common/options",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/whitelisting/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/whitelisting/BUILD
index 91ac69a..9d8a0d9 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/whitelisting/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/whitelisting/BUILD
@@ -1,4 +1,7 @@
-load("@rules_java//java:defs.bzl", "java_test")
+# Description:
+# Tests for whitelisting mechanism for rolling out and deprecating pieces of Blaze functionality.
+
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
package(
default_testonly = 1,
@@ -8,32 +11,42 @@
filegroup(
name = "srcs",
testonly = 0,
- srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+ srcs = glob(["*"]),
+)
+
+java_library(
+ name = "WhitelistUtil",
+ testonly = 1,
+ srcs = ["WhitelistDummyRule.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/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ ],
)
# Description:
# Tests for whitelisting mechanism for rolling out and deprecating pieces of Bazel functionality.
java_test(
name = "WhitelistingTests",
- srcs = glob(["*.java"]),
+ srcs = [
+ "WhitelistCachingTest.java",
+ "WhitelistTest.java",
+ ],
test_class = "com.google.devtools.build.lib.AllTests",
- 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/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:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ runtime_deps = [
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
- "//third_party:guava-testlib",
+ ],
+ deps = [
+ ":WhitelistUtil",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//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",
],
)
@@ -43,7 +56,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -51,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/bazel/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/BUILD
index 354df19..f2bd8ce 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/bazel/BUILD
@@ -51,9 +51,10 @@
"//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/test/java/com/google/devtools/build/lib:analysis_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
@@ -103,13 +104,16 @@
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:crosstool_config_java_proto",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//src/test/java/com/google/devtools/build/lib/rules/android:AndroidLocalTestTest",
+ "//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",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD
index fdfd24e..5bde900 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD
@@ -55,11 +55,15 @@
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//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",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:diffutils",
"//third_party:guava",
"//third_party:guava-testlib",
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD
index 1d47918..4eb4476 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD
@@ -20,9 +20,10 @@
deps = [
"//src/main/java/com/google/devtools/build/lib/bazel/repository/cache",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:junit4",
"//third_party:mockito",
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD
index 90a63e3..30ff392 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD
@@ -25,9 +25,11 @@
"//src/main/java/com/google/devtools/build/lib/bazel/repository/cache",
"//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/events: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/vfs/util",
"//third_party:guava",
"//third_party:junit4",
"//third_party:mockito",
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/BUILD b/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
index 425e356..fe95924 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
@@ -28,7 +28,7 @@
"//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/util/io",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:junit4",
"//third_party:truth",
],
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/tests/BUILD b/src/test/java/com/google/devtools/build/lib/blackbox/tests/BUILD
index 4d98089..9385201 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/BUILD
@@ -59,6 +59,7 @@
deps = [
":common_deps",
"//src/main/java/com/google/devtools/build/lib:bazel-ninja",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD
index baedb36..e871ced 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD
@@ -49,7 +49,8 @@
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:bazel-repository",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
],
)
@@ -67,7 +68,8 @@
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:bazel-repository",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
],
)
@@ -83,7 +85,8 @@
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:bazel-repository",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD b/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD
index 4ca7bbf..c2adf42 100644
--- a/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD
@@ -29,8 +29,8 @@
"//src/main/java/com/google/devtools/build/lib/clock",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:mockito",
diff --git a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
index 22ec1b8..58f5144 100644
--- a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
@@ -24,8 +24,9 @@
"//src/main/java/com/google/devtools/build/lib/buildeventstream/transports",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/common/options",
- "//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/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:junit4",
"//third_party:mockito",
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/BUILD b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
index da7a94c..1c85a79 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
@@ -8,102 +8,63 @@
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/buildtool/util:srcs",
+ ],
)
-java_library(
- name = "testutil",
- srcs = glob(["util/*.java"]),
+java_test(
+ name = "JobsConverterTest",
+ srcs = [
+ "JobsConverterTest.java",
+ ],
deps = [
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
- "//src/main/java/com/google/devtools/build/lib:bazel/BazelRepositoryModule",
- "//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:build-request-options",
- "//src/main/java/com/google/devtools/build/lib:command-utils",
- "//src/main/java/com/google/devtools/build/lib:detailed_exit_code",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:exitcode-external",
- "//src/main/java/com/google/devtools/build/lib:keep-going-option",
- "//src/main/java/com/google/devtools/build/lib:loading-phase-threads-option",
- "//src/main/java/com/google/devtools/build/lib:logging-util",
- "//src/main/java/com/google/devtools/build/lib:runtime",
- "//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/buildeventstream",
- "//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/exec/local:options",
- "//src/main/java/com/google/devtools/build/lib/includescanning",
- "//src/main/java/com/google/devtools/build/lib/network:connectivity_status",
- "//src/main/java/com/google/devtools/build/lib/network:noop_connectivity",
- "//src/main/java/com/google/devtools/build/lib/packages",
- "//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
- "//src/main/java/com/google/devtools/build/lib/pkgcache",
- "//src/main/java/com/google/devtools/build/lib/profiler",
- "//src/main/java/com/google/devtools/build/lib/sandbox",
- "//src/main/java/com/google/devtools/build/lib/shell",
- "//src/main/java/com/google/devtools/build/lib/standalone",
- "//src/main/java/com/google/devtools/build/lib/util/io",
- "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
- "//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/main/java/com/google/devtools/build/lib/vfs:output_service",
- "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- "//src/main/java/com/google/devtools/common/options:invocation_policy",
- "//src/main/java/com/google/devtools/common/options:options_internal",
- "//src/main/protobuf:invocation_policy_java_proto",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
- "//src/test/java/com/google/devtools/build/lib:integration_testutil",
- "//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/skyframe:testutil",
- "//third_party:guava",
+ "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
+ "//src/main/java/com/google/devtools/common/options",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//third_party:junit4",
"//third_party:truth",
],
)
java_test(
- name = "BuildtoolTests",
+ name = "SymlinkForestTest",
srcs = [
- "JobsConverterTest.java",
"SymlinkForestTest.java",
],
- test_class = "com.google.devtools.build.lib.AllTests",
- runtime_deps = ["//src/test/java/com/google/devtools/build/lib:test_runner"],
deps = [
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/main/java/com/google/devtools/build/lib:build-request-options",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
"//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/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:options_internal",
- "//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",
+ "//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:junit4",
"//third_party:truth",
],
)
+test_suite(
+ name = "BuildtoolTests",
+ tests = [
+ ":JobsConverterTest",
+ ":SymlinkForestTest",
+ ],
+)
+
java_test(
name = "ActionListenerIntegrationTest",
srcs = ["ActionListenerIntegrationTest.java"],
tags = [
- "no_windows",
- # TODO(laszlocsomor): remove "manual" after BuildIntegrationTestCase works with Bazel.
"manual",
+ "no_windows",
],
deps = [
- ":testutil",
"//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",
@@ -112,7 +73,8 @@
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:extra_actions_base_java_proto",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -127,12 +89,10 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:runtime",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:junit4",
- "//third_party:truth",
],
)
@@ -144,11 +104,10 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:junit4",
"//third_party:truth",
],
@@ -162,11 +121,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:events",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
@@ -180,14 +139,14 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
)
@@ -199,12 +158,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
@@ -218,11 +176,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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:junit4",
"//third_party:truth",
],
@@ -236,12 +194,10 @@
"no_windows",
],
deps = [
- ":testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
)
@@ -253,10 +209,10 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//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/buildtool/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",
@@ -271,8 +227,8 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -288,11 +244,12 @@
],
deps = [
":IoHookTestCase",
- ":testutil",
"//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: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:TestUtils",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -307,10 +264,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//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:testutil",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
@@ -325,12 +283,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
)
@@ -342,12 +299,10 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/unix",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
"//third_party:junit4",
- "//third_party:truth",
],
)
@@ -359,12 +314,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
)
@@ -376,13 +330,14 @@
"no_windows",
],
deps = [
- ":testutil",
"//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/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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:guava-testlib",
"//third_party:junit4",
@@ -398,11 +353,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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:junit4",
"//third_party:truth",
],
@@ -416,12 +371,12 @@
"no_windows",
],
deps = [
- ":testutil",
"//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/vfs",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
@@ -435,11 +390,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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:junit4",
"//third_party:truth",
],
@@ -453,10 +408,11 @@
"no_windows",
],
deps = [
- ":testutil",
"//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:testutil",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
@@ -471,13 +427,12 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
],
)
@@ -489,13 +444,13 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:util",
"//src/main/java/com/google/devtools/build/lib/unix",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
@@ -510,7 +465,6 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:events",
"//src/main/java/com/google/devtools/build/lib:keep-going-option",
"//src/main/java/com/google/devtools/build/lib:runtime",
@@ -521,7 +475,9 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:build_java_proto",
"//src/main/protobuf:invocation_policy_java_proto",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/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",
@@ -536,30 +492,29 @@
"no_windows",
],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//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/buildtool/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",
],
)
-java_test(
+java_library(
name = "TransitiveDataDependencyTest",
srcs = ["TransitiveDataDependencyTest.java"],
tags = [
- "manual",
"no_windows",
],
deps = [
- ":testutil",
"//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/util/io",
"//src/main/java/com/google/devtools/build/lib/util/io:out-err",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -577,13 +532,12 @@
test_class = "com.google.devtools.build.lib.AllTests",
runtime_deps = ["//src/test/java/com/google/devtools/build/lib:test_runner"],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/util/io",
"//src/main/java/com/google/devtools/build/lib/util/io:out-err",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:junit4",
"//third_party:truth",
],
@@ -593,13 +547,13 @@
name = "CustomRealFilesystemBuildIntegrationTestCase",
srcs = ["CustomRealFilesystemBuildIntegrationTestCase.java"],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib/actions",
"//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/util/io:out-err",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -610,30 +564,24 @@
name = "IoHookTestCase",
srcs = ["IoHookTestCase.java"],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib/unix",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
- "//third_party:junit4",
- "//third_party:truth",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
java_test(
name = "AqueryBuildToolTest",
srcs = ["AqueryBuildToolTest.java"],
- tags = [
- "manual",
- "no_windows",
- ],
+ tags = ["manual"],
deps = [
- ":testutil",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib/query2",
"//src/main/java/com/google/devtools/build/lib/query2/engine",
"//src/main/java/com/google/devtools/common/options",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -646,7 +594,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -654,5 +601,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/buildtool/util/BUILD b/src/test/java/com/google/devtools/build/lib/buildtool/util/BUILD
new file mode 100644
index 0000000..4841136
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/util/BUILD
@@ -0,0 +1,78 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+# Redirection for util lib to allow exporting both ":util_internal" and the
+# implementation of RulesModule, StrategyModule and WorkspaceStatuusModule
+# as named in
+# src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+java_library(
+ name = "util",
+ exports = [
+ ":util_internal",
+ ],
+ runtime_deps = [
+ "//src/main/java/com/google/devtools/build/lib:bazel-modules",
+ "//src/main/java/com/google/devtools/build/lib:bazel-rules",
+ ],
+)
+java_library(
+ name = "util_internal",
+ srcs = glob(["*.java"]),
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:bazel-main",
+ "//src/main/java/com/google/devtools/build/lib:bazel/BazelRepositoryModule",
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//src/main/java/com/google/devtools/build/lib:build-request-options",
+ "//src/main/java/com/google/devtools/build/lib:command-utils",
+ "//src/main/java/com/google/devtools/build/lib:detailed_exit_code",
+ "//src/main/java/com/google/devtools/build/lib:exitcode-external",
+ "//src/main/java/com/google/devtools/build/lib:keep-going-option",
+ "//src/main/java/com/google/devtools/build/lib:loading-phase-threads-option",
+ "//src/main/java/com/google/devtools/build/lib:runtime",
+ "//src/main/java/com/google/devtools/build/lib/buildeventstream",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//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/exec/local:options",
+ "//src/main/java/com/google/devtools/build/lib/includescanning",
+ "//src/main/java/com/google/devtools/build/lib/network:connectivity_status",
+ "//src/main/java/com/google/devtools/build/lib/network:noop_connectivity",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
+ "//src/main/java/com/google/devtools/build/lib/pkgcache",
+ "//src/main/java/com/google/devtools/build/lib/profiler",
+ "//src/main/java/com/google/devtools/build/lib/sandbox",
+ "//src/main/java/com/google/devtools/build/lib/shell",
+ "//src/main/java/com/google/devtools/build/lib/standalone",
+ "//src/main/java/com/google/devtools/build/lib/util/io",
+ "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
+ "//src/main/java/com/google/devtools/build/lib/vfs:output_service",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//src/main/java/com/google/devtools/common/options:invocation_policy",
+ "//src/main/protobuf:invocation_policy_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/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/integration/util",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//src/test/java/com/google/devtools/build/lib/skyframe:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs:testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/events/BUILD b/src/test/java/com/google/devtools/build/lib/events/BUILD
new file mode 100644
index 0000000..5e2f5e0
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/events/BUILD
@@ -0,0 +1,54 @@
+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 = "EventsTests_lib",
+ srcs = glob(["*.java"]),
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
+ "//src/main/java/com/google/devtools/build/lib/util/io",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//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",
+ ],
+)
+
+java_test(
+ name = "EventsTests",
+ size = "small",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":EventsTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+java_library(
+ name = "testutil",
+ testonly = 1,
+ srcs = glob(["util/*.java"]) + ["EventTestTemplate.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:events",
+ "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//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",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/exec/BUILD b/src/test/java/com/google/devtools/build/lib/exec/BUILD
new file mode 100644
index 0000000..79e636a
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/exec/BUILD
@@ -0,0 +1,65 @@
+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(["*"]) + [
+ "//src/test/java/com/google/devtools/build/lib/exec/local:srcs",
+ "//src/test/java/com/google/devtools/build/lib/exec/util:srcs",
+ ],
+)
+
+java_library(
+ name = "ExecTests_lib",
+ srcs = glob([
+ "*.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:os_util",
+ "//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/actions:localhost_capacity",
+ "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+ "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//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/remote/options",
+ "//src/main/java/com/google/devtools/build/lib/shell",
+ "//src/main/java/com/google/devtools/build/lib/util/io",
+ "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/main/java/com/google/devtools/build/lib/vfs:output_service",
+ "//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/protobuf:spawn_java_proto",
+ "//src/main/protobuf:test_status_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/exec/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:jsr305",
+ "//third_party:junit4",
+ "//third_party:mockito",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "ExecTests",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":ExecTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/BUILD b/src/test/java/com/google/devtools/build/lib/exec/local/BUILD
new file mode 100644
index 0000000..03e218f
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/exec/local/BUILD
@@ -0,0 +1,77 @@
+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 = "LocalSpawnRunnerTest",
+ srcs = ["LocalSpawnRunnerTest.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:os_util",
+ "//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/actions:localhost_capacity",
+ "//src/main/java/com/google/devtools/build/lib/exec/local",
+ "//src/main/java/com/google/devtools/build/lib/exec/local:options",
+ "//src/main/java/com/google/devtools/build/lib/shell",
+ "//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/lib/vfs/inmemoryfs",
+ "//src/main/java/com/google/devtools/common/options",
+ "//src/test/java/com/google/devtools/build/lib/exec/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:TestConstants",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/shell/integration:spend_cpu_time", # keep
+ "//third_party:guava",
+ "//third_party:mockito",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "PosixLocalEnvProviderTest",
+ srcs = ["PosixLocalEnvProviderTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/exec/local",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "WindowsLocalEnvProviderTest",
+ srcs = ["WindowsLocalEnvProviderTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/exec/local",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+test_suite(
+ name = "ExecLocalTests",
+ tests = [
+ ":LocalSpawnRunnerTest",
+ ":PosixLocalEnvProviderTest",
+ ":WindowsLocalEnvProviderTest",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/BUILD b/src/test/java/com/google/devtools/build/lib/exec/util/BUILD
new file mode 100644
index 0000000..7cb6ab7
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/exec/util/BUILD
@@ -0,0 +1,37 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+java_library(
+ name = "util",
+ srcs = glob([
+ "*.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:runtime",
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
+ "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//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/vfs",
+ "//src/main/java/com/google/devtools/common/options",
+ "//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",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/integration/util/BUILD b/src/test/java/com/google/devtools/build/lib/integration/util/BUILD
new file mode 100644
index 0000000..f68eaba
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/integration/util/BUILD
@@ -0,0 +1,27 @@
+# Description:
+# A grab-bag of testing utilities.
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+java_library(
+ name = "util",
+ testonly = 1,
+ srcs = glob(["*.java"]),
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/outputfilter/BUILD b/src/test/java/com/google/devtools/build/lib/outputfilter/BUILD
index 7c3b129..6bf91af 100644
--- a/src/test/java/com/google/devtools/build/lib/outputfilter/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/outputfilter/BUILD
@@ -28,9 +28,9 @@
"//src/main/java/com/google/devtools/build/lib/outputfilter",
"//src/main/java/com/google/devtools/build/lib/unix",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//src/test/java/com/google/devtools/build/lib/buildtool:testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/BUILD b/src/test/java/com/google/devtools/build/lib/packages/BUILD
new file mode 100644
index 0000000..b1b171b
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/packages/BUILD
@@ -0,0 +1,136 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+licenses(["notice"])
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["**"]) + [
+ "//src/test/java/com/google/devtools/build/lib/packages/util/mock:srcs",
+ ],
+)
+
+java_library(
+ name = "PackageTestsUtil",
+ srcs = ["WorkspaceFactoryTestHelper.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//src/main/java/com/google/devtools/build/lib:syntax",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "PackagesTests",
+ size = "small",
+ srcs = glob(
+ include = ["*.java"],
+ exclude = [
+ "BazelDocumentationTest.java",
+ "ExternalPackageTest.java",
+ "WorkspaceFactoryTestHelper.java",
+ ],
+ ),
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+ deps = [
+ ":PackageTestsUtil",
+ ":testutil",
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//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/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/packages:starlark_semantics_options",
+ "//src/main/java/com/google/devtools/build/lib/pkgcache",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
+ "//src/main/java/com/google/devtools/build/lib/skylarkinterface",
+ "//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/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/events: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:TestUtils",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:mockito",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "BazelDocumentationTests",
+ size = "medium",
+ srcs = ["BazelDocumentationTest.java"],
+ data = [
+ "//site:docs/user-manual.html",
+ ],
+ test_class = "com.google.devtools.build.lib.packages.BazelDocumentationTest",
+ deps = [
+ ":testutil",
+ "//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:os_util",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "@bazel_tools//tools/java/runfiles",
+ ],
+)
+
+java_library(
+ name = "testutil",
+ srcs = glob(["util/*.java"]),
+ resources = [
+ "//src/test/java/com/google/devtools/build/lib/packages/util/mock:android_cc_toolchain_config.bzl",
+ "//src/test/java/com/google/devtools/build/lib/packages/util/mock:osx_cc_toolchain_config.bzl",
+ "//tools/build_defs/cc:action_names.bzl",
+ "//tools/python:srcs", # For BazelMockPythonSupport
+ "@rules_cc//cc:srcs",
+ ],
+ deps = [
+ "//src/main/java/com/google/devtools/build/docgen:docgen_javalib",
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//src/main/java/com/google/devtools/build/lib:proto-rules",
+ "//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/clock",
+ "//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/packages:starlark_semantics_options",
+ "//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/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
+ "//src/main/java/com/google/devtools/build/lib/util/io",
+ "//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:test-build-options",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/mock/BUILD b/src/test/java/com/google/devtools/build/lib/packages/util/mock/BUILD
index 290eb60..3f37943 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/mock/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/mock/BUILD
@@ -1,15 +1,15 @@
licenses(["notice"])
-exports_files(
- [
- "android_cc_toolchain_config.bzl",
- "osx_cc_toolchain_config.bzl",
- ],
- visibility = ["//visibility:public"],
+package(
+ default_visibility = ["//src:__subpackages__"],
)
filegroup(
name = "srcs",
- srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+ srcs = glob(["*"]),
)
+
+exports_files([
+ "android_cc_toolchain_config.bzl",
+ "osx_cc_toolchain_config.bzl",
+])
diff --git a/src/test/java/com/google/devtools/build/lib/profiler/BUILD b/src/test/java/com/google/devtools/build/lib/profiler/BUILD
index f5c02c0..37f8df0 100644
--- a/src/test/java/com/google/devtools/build/lib/profiler/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/profiler/BUILD
@@ -28,7 +28,9 @@
"//src/main/java/com/google/devtools/build/lib/profiler",
"//src/main/java/com/google/devtools/build/lib/profiler:profiler-output",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib: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:TestUtils",
"//third_party:guava",
"//third_party:junit4",
"//third_party:mockito",
diff --git a/src/test/java/com/google/devtools/build/lib/query2/AllTests.java b/src/test/java/com/google/devtools/build/lib/query2/AllTests.java
deleted file mode 100644
index bde1681..0000000
--- a/src/test/java/com/google/devtools/build/lib/query2/AllTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2019 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.lib.query2;
-
-import com.google.devtools.build.lib.testutil.ClasspathSuite;
-import org.junit.runner.RunWith;
-
-/** Runs all tests in the classpath. */
-@RunWith(ClasspathSuite.class)
-public class AllTests {}
diff --git a/src/test/java/com/google/devtools/build/lib/query2/BUILD b/src/test/java/com/google/devtools/build/lib/query2/BUILD
index 5cb8427..14f5b15 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/query2/BUILD
@@ -1,56 +1,24 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_test")
-
-licenses(["notice"]) # Apache 2.0
+package(
+ default_visibility = ["//src:__subpackages__"],
+)
filegroup(
name = "srcs",
- srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
-)
-
-java_library(
- name = "Query2Tests_lib",
- testonly = 1,
- srcs = glob(
- [
- "*.java",
- "aquery/*.java",
- "cquery/*.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:filetype",
- "//src/main/java/com/google/devtools/build/lib:os_util",
- "//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/query2",
- "//src/main/java/com/google/devtools/build/lib/query2:aquery-utils",
- "//src/main/java/com/google/devtools/build/lib/query2/engine",
- "//src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers",
- "//src/main/java/com/google/devtools/build/lib/query2/query/output",
- "//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/main/java/com/google/devtools/build/skyframe",
- "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/main/protobuf:analysis_java_proto",
- "//src/main/protobuf:build_java_proto",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:default_test_build_rules",
- "//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/query2/testutil",
- "//third_party:guava",
- "//third_party:jsr305",
- "//third_party:junit4",
- "//third_party:truth",
+ srcs = glob(["*"]) + [
+ "//src/test/java/com/google/devtools/build/lib/query2/aquery:srcs",
+ "//src/test/java/com/google/devtools/build/lib/query2/cquery:srcs",
+ "//src/test/java/com/google/devtools/build/lib/query2/engine:srcs",
+ "//src/test/java/com/google/devtools/build/lib/query2/query/output:srcs",
+ "//src/test/java/com/google/devtools/build/lib/query2/testutil:srcs",
],
)
-java_test(
+test_suite(
name = "AllTests",
- size = "large",
- shard_count = 20,
- test_class = "com.google.devtools.build.lib.query2.AllTests",
- runtime_deps = [":Query2Tests_lib"],
+ tests = [
+ "//src/test/java/com/google/devtools/build/lib/query2/aquery:ActionGraphProtoOutputFormatterCallbackTest",
+ "//src/test/java/com/google/devtools/build/lib/query2/cquery:BuildOutputFormatterCallbackTest",
+ "//src/test/java/com/google/devtools/build/lib/query2/cquery:ProtoOutputFormatterCallbackTest",
+ "//src/test/java/com/google/devtools/build/lib/query2/cquery:TransitionsOutputFormatterTest",
+ ],
)
diff --git a/src/test/java/com/google/devtools/build/lib/query2/aquery/BUILD b/src/test/java/com/google/devtools/build/lib/query2/aquery/BUILD
new file mode 100644
index 0000000..63507e2
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/query2/aquery/BUILD
@@ -0,0 +1,62 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ srcs = glob(["*"]),
+)
+
+java_test(
+ name = "ActionGraphProtoOutputFormatterCallbackTest",
+ size = "large",
+ srcs = ["ActionGraphProtoOutputFormatterCallbackTest.java"],
+ deps = [
+ ":action_graph_query_helper",
+ ":action_graph_query_test",
+ "//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:os_util",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers",
+ "//src/main/protobuf:analysis_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "action_graph_query_helper",
+ testonly = 1,
+ srcs = ["ActionGraphQueryHelper.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//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/query2/testutil",
+ "//third_party:guava",
+ ],
+)
+
+java_library(
+ name = "action_graph_query_test",
+ testonly = 1,
+ srcs = ["ActionGraphQueryTest.java"],
+ deps = [
+ ":action_graph_query_helper",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//src/test/java/com/google/devtools/build/lib/query2/testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/query2/cquery/BUILD b/src/test/java/com/google/devtools/build/lib/query2/cquery/BUILD
new file mode 100644
index 0000000..dac1a32
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/query2/cquery/BUILD
@@ -0,0 +1,116 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ srcs = glob(["*"]),
+)
+
+java_test(
+ name = "BuildOutputFormatterCallbackTest",
+ size = "large",
+ srcs = ["BuildOutputFormatterCallbackTest.java"],
+ deps = [
+ ":configured_target_query_helper",
+ ":configured_target_query_test",
+ "//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:filetype",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "configured_target_query_helper",
+ testonly = 1,
+ srcs = ["ConfiguredTargetQueryHelper.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//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/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/query2/testutil",
+ "//third_party:guava",
+ ],
+)
+
+java_library(
+ name = "configured_target_query_test",
+ testonly = 1,
+ srcs = ["ConfiguredTargetQueryTest.java"],
+ deps = [
+ ":configured_target_query_helper",
+ "//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/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/query2/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:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "ProtoOutputFormatterCallbackTest",
+ size = "large",
+ srcs = ["ProtoOutputFormatterCallbackTest.java"],
+ deps = [
+ ":configured_target_query_helper",
+ ":configured_target_query_test",
+ "//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:filetype",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers",
+ "//src/main/protobuf:analysis_java_proto",
+ "//src/main/protobuf:build_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/query2/testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "TransitionsOutputFormatterTest",
+ size = "large",
+ srcs = ["TransitionsOutputFormatterTest.java"],
+ deps = [
+ ":configured_target_query_helper",
+ ":configured_target_query_test",
+ "//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:filetype",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/query2",
+ "//src/main/java/com/google/devtools/build/lib/query2/engine",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/query2/testutil",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/query2/engine/BUILD b/src/test/java/com/google/devtools/build/lib/query2/engine/BUILD
index eab99a8..6b7169e 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/engine/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/query2/engine/BUILD
@@ -1,11 +1,13 @@
load("@rules_java//java:defs.bzl", "java_test")
-licenses(["notice"]) # Apache 2.0
+package(
+ default_visibility = ["//src:__subpackages__"],
+)
filegroup(
name = "srcs",
- srcs = glob(["**"]),
- visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+ testonly = 0,
+ srcs = glob(["*"]),
)
java_test(
@@ -24,11 +26,12 @@
"//src/main/java/com/google/devtools/build/lib/query2/engine",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/build/skyframe",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:default_test_build_rules",
- "//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/analysis/util:test-build-options",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//src/test/java/com/google/devtools/build/lib/query2/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:TestSuite",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/lib/query2/query/output/BUILD b/src/test/java/com/google/devtools/build/lib/query2/query/output/BUILD
new file mode 100644
index 0000000..103ed6b
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/query2/query/output/BUILD
@@ -0,0 +1,28 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
+package(
+ default_visibility = ["//src:__subpackages__"],
+)
+
+licenses(["notice"])
+
+filegroup(
+ name = "srcs",
+ srcs = glob(["*"]),
+)
+
+java_test(
+ name = "SyntheticAttributeHashCalculatorTest",
+ srcs = ["SyntheticAttributeHashCalculatorTest.java"],
+ deps = [
+ "//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/query2/query/output",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/main/protobuf:build_java_proto",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD b/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD
index 307931b..29d5fa9 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD
@@ -2,13 +2,9 @@
package(
default_testonly = 1,
- default_visibility = [
- "//src/test/java/com/google/devtools/build/lib:__subpackages__",
- ],
+ default_visibility = ["//src:__subpackages__"],
)
-licenses(["notice"]) # Apache 2.0
-
filegroup(
name = "srcs",
testonly = 0,
@@ -33,8 +29,6 @@
"//src/main/java/com/google/devtools/build/lib/query2",
"//src/main/java/com/google/devtools/build/lib/query2/common:abstract-blaze-query-env",
"//src/main/java/com/google/devtools/build/lib/query2/engine",
- "//src/main/java/com/google/devtools/build/lib/rules/cpp",
- "//src/main/java/com/google/devtools/build/lib/rules/java:java-implicit-attributes",
"//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",
@@ -42,11 +36,12 @@
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/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:jsr305",
"//third_party:junit4",
"//third_party:truth",
],
diff --git a/src/test/java/com/google/devtools/build/lib/remote/BUILD b/src/test/java/com/google/devtools/build/lib/remote/BUILD
index a0c907a..5aa8854 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/remote/BUILD
@@ -65,11 +65,14 @@
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:remote_execution_log_java_proto",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
"//src/test/java/com/google/devtools/build/lib/remote/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:api_client",
"//third_party:guava",
"//third_party:mockito",
diff --git a/src/test/java/com/google/devtools/build/lib/remote/downloader/BUILD b/src/test/java/com/google/devtools/build/lib/remote/downloader/BUILD
index 5fb2619..6b6b515 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/downloader/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/remote/downloader/BUILD
@@ -32,10 +32,13 @@
"//src/main/java/com/google/devtools/build/lib/remote/util",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
"//src/test/java/com/google/devtools/build/lib/remote/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",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:junit4",
"//third_party:mockito",
diff --git a/src/test/java/com/google/devtools/build/lib/remote/http/BUILD b/src/test/java/com/google/devtools/build/lib/remote/http/BUILD
index 9d9fe95..ad5e2bd 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/http/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/remote/http/BUILD
@@ -24,7 +24,9 @@
"//src/main/java/com/google/devtools/build/lib/remote/util",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib: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:TestUtils",
"//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/http",
"//third_party:api_client",
"//third_party:auth",
diff --git a/src/test/java/com/google/devtools/build/lib/remote/logging/BUILD b/src/test/java/com/google/devtools/build/lib/remote/logging/BUILD
index 9afc8c7..1e9a2d2 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/logging/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/remote/logging/BUILD
@@ -23,7 +23,8 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:remote_execution_log_java_proto",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib: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:mockito",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/remote/merkletree/BUILD b/src/test/java/com/google/devtools/build/lib/remote/merkletree/BUILD
index 2985050..0deab48 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/merkletree/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/remote/merkletree/BUILD
@@ -25,10 +25,10 @@
"//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_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/remote/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:truth",
"//third_party/protobuf:protobuf_java",
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 e3ff6da..3e385b4 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
@@ -22,9 +22,9 @@
"//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/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//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",
@@ -39,8 +39,8 @@
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/packages",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//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 +53,7 @@
deps = [
":AndroidBuildViewTestCase",
"//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//third_party:junit4",
"//third_party:truth",
],
@@ -66,8 +66,8 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//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",
],
@@ -94,11 +94,12 @@
"//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:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
"//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper",
- "//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/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",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -117,7 +118,7 @@
"//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",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -136,8 +137,8 @@
"//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",
+ "//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",
@@ -191,10 +192,10 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/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,10 +210,10 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/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",
],
@@ -229,10 +230,10 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/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",
@@ -255,10 +256,10 @@
"//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:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
"//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//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",
@@ -277,10 +278,10 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
"//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -294,8 +295,8 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
+ "//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",
@@ -314,9 +315,9 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//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",
@@ -335,10 +336,10 @@
"//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_testutil",
"//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper",
- "//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/actions/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",
@@ -348,10 +349,10 @@
java_test(
name = "AndroidSdkTest",
srcs = ["AndroidSdkTest.java"],
- runtime_deps = ["//src/test/java/com/google/devtools/build/lib:testutil"],
+ 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_testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
"//third_party:junit4",
"//third_party:truth",
],
@@ -366,8 +367,8 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
+ "//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",
@@ -386,9 +387,10 @@
"//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_testutil",
- "//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/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",
"//third_party:junit4",
"//third_party:truth",
@@ -398,7 +400,7 @@
java_test(
name = "AndroidDataConverterTest",
srcs = ["AndroidDataConverterTest.java"],
- runtime_deps = ["//src/test/java/com/google/devtools/build/lib:testutil"],
+ 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",
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 e09497e..b8c4698 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
@@ -22,9 +22,10 @@
"//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/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/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:guava-testlib",
"//third_party:jsr305",
@@ -39,7 +40,8 @@
runtime_deps = [
":AppleRulesTests_lib",
"//src/main/java/com/google/devtools/build/lib:util",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
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 1303832..acf7ac6 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
@@ -27,10 +27,12 @@
"//src/main/java/com/google/devtools/build/lib/rules/config",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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/skylark: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:jsr305",
@@ -45,7 +47,7 @@
runtime_deps = [
":ConfigRulesTests_lib",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
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 395a5d2..8876e55 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
@@ -64,11 +64,15 @@
"//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:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
"//src/test/java/com/google/devtools/build/lib:syntax_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
+ "//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",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
@@ -92,7 +96,7 @@
"//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_testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
@@ -112,9 +116,9 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//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",
@@ -125,8 +129,8 @@
name = "SkylarkCcCommonTestHelper",
srcs = ["SkylarkCcCommonTestHelper.java"],
deps = [
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
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 8e6452f..bd35789 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
@@ -31,11 +31,13 @@
"//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/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/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/cpp: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:TestConstants",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
@@ -53,7 +55,8 @@
runtime_deps = [
":ObjcRulesTests_lib",
"//src/main/java/com/google/devtools/build/lib:util",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
],
)
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 a5e7a71..b13ec78 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
@@ -28,8 +28,8 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
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 5ed1cb2..ba9e5f2 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
@@ -2,13 +2,13 @@
package(
default_testonly = True,
+ default_visibility = ["//src:__subpackages__"],
)
filegroup(
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src:__subpackages__"],
)
test_suite(
@@ -45,8 +45,9 @@
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:python-rules",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
@@ -57,10 +58,9 @@
srcs = ["PyRuntimeConfiguredTargetTest.java"],
deps = [
":PythonTestUtils",
- "//src/main/java/com/google/devtools/build/lib:bazel-rules",
"//src/main/java/com/google/devtools/build/lib:python-rules",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
"//third_party:junit4",
"//third_party:truth",
],
@@ -71,11 +71,10 @@
srcs = ["PyBaseConfiguredTargetTestBase.java"],
deps = [
":PythonTestUtils",
- "//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:python-rules",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+ "//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",
],
@@ -87,7 +86,6 @@
deps = [
":PyBaseTestBase",
":PythonTestUtils",
- "//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:python-rules",
"//src/main/java/com/google/devtools/build/lib/actions",
@@ -103,7 +101,8 @@
deps = [
":PyExecutableTestBase",
"//src/main/java/com/google/devtools/build/lib:build-base",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
"//third_party:junit4",
"//third_party:truth",
],
@@ -126,8 +125,7 @@
":PythonTestUtils",
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:python-rules",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
+ "//src/test/java/com/google/devtools/build/lib/actions/util",
"//third_party:junit4",
"//third_party:truth",
],
@@ -138,7 +136,8 @@
srcs = ["PythonVersionTest.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib:python-rules",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
@@ -151,8 +150,9 @@
"//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/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
@@ -165,8 +165,9 @@
deps = [
"//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:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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:junit4",
"//third_party:truth",
],
@@ -178,8 +179,9 @@
deps = [
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/analysis/platform",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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:junit4",
"//third_party:truth",
],
@@ -192,9 +194,9 @@
"//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:python-rules",
"//src/main/java/com/google/devtools/build/lib:syntax",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:guava",
+ "//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",
],
@@ -210,8 +212,9 @@
"//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/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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:junit4",
"//third_party:truth",
@@ -226,8 +229,6 @@
"//src/main/java/com/google/devtools/build/lib:python-rules",
"//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:pathfragment",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
"//src/test/java/com/google/devtools/build/lib/skylark:testutil",
"//third_party:junit4",
"//third_party:truth",
@@ -257,7 +258,7 @@
"//src/main/java/com/google/devtools/build/lib:python-rules",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/packages",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
@@ -272,8 +273,9 @@
"//src/main/java/com/google/devtools/build/lib:python-rules",
"//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:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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:junit4",
"//third_party:truth",
],
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 dceb126..31767d4 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
@@ -17,6 +17,9 @@
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",
@@ -38,10 +41,11 @@
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//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/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",
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/BUILD b/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
index d4e4fb9..68fa5fd 100644
--- a/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -29,7 +29,8 @@
"//src/main/java/com/google/devtools/build/lib/sandbox",
"//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",
+ "//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",
@@ -60,7 +61,9 @@
"//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/test/java/com/google/devtools/build/lib: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:TestUtils",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/shell/BUILD b/src/test/java/com/google/devtools/build/lib/shell/BUILD
index ed79d3e..3da36d3 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/shell/BUILD
@@ -42,9 +42,13 @@
"//src/main/java/com/google/devtools/build/lib/unix",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/protobuf:execution_statistics_java_proto",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/events: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",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
@@ -83,7 +87,8 @@
],
deps = [
"//src/main/java/com/google/devtools/build/lib/shell",
- "//src/test/java/com/google/devtools/build/lib: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:junit4",
"//third_party:truth",
@@ -119,7 +124,8 @@
],
deps = [
"//src/main/java/com/google/devtools/build/lib/shell",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
@@ -133,7 +139,8 @@
],
deps = [
"//src/main/java/com/google/devtools/build/lib/shell",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
@@ -150,7 +157,8 @@
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
"//src/main/protobuf:execution_statistics_java_proto",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
"//third_party:junit4",
"//third_party:truth",
],
@@ -180,7 +188,8 @@
deps = [
"//src/main/java/com/google/devtools/build/lib:os_util",
"//src/main/java/com/google/devtools/build/lib/shell",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
@@ -216,7 +225,8 @@
],
deps = [
"//src/main/java/com/google/devtools/build/lib/shell",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
@@ -261,9 +271,12 @@
"//src/main/java/com/google/devtools/build/lib/unix",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/protobuf:execution_statistics_java_proto",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
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 cb83c39..80c5e7f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -43,10 +43,11 @@
"//src/main/java/com/google/devtools/build/lib/vfs",
"//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_testutil",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
- "//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/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//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/vfs/util",
"//src/test/java/com/google/devtools/build/skyframe:testutil",
"//third_party:guava",
"//third_party:guava-testlib",
@@ -117,13 +118,18 @@
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:action_cache_java_proto",
"//src/main/protobuf:analysis_java_proto",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:default_test_build_rules",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
- "//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/actions/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util:test-build-options",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//src/test/java/com/google/devtools/build/lib/rules/platform: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",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//src/test/java/com/google/devtools/build/skyframe:testutil",
"//third_party:auto_value",
"//third_party:guava",
"//third_party:guava-testlib",
@@ -162,8 +168,9 @@
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
"//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:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
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 bdff3cc..55ee242 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
@@ -29,9 +29,10 @@
"//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_testutil",
- "//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/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",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
index 4c64ed5..5abd58c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
@@ -26,7 +26,8 @@
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
"//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",
+ "//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",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD
index b488816..7f77b7f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD
@@ -29,8 +29,8 @@
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/skylarkinterface",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/BUILD b/src/test/java/com/google/devtools/build/lib/skylark/BUILD
index b749890..6908b3f 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skylark/BUILD
@@ -37,10 +37,12 @@
"//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/common/options:options_internal",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
"//src/test/java/com/google/devtools/build/lib:syntax_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/analysis/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
@@ -86,12 +88,14 @@
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/main/java/com/google/devtools/common/options",
- "//src/test/java/com/google/devtools/build/lib:actions_testutil",
- "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
- "//src/test/java/com/google/devtools/build/lib:packages_testutil",
"//src/test/java/com/google/devtools/build/lib:test_runner",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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/events:testutil",
+ "//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/vfs/util",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD b/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD
index 40fe366..b8a0b3b 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD
@@ -35,8 +35,9 @@
"//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:skylark_debugging_java_proto",
"//src/main/java/com/google/devtools/build/lib/skylarkdebug/server",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
@@ -53,7 +54,8 @@
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:skylark_debugging_java_proto",
"//src/main/java/com/google/devtools/build/lib/skylarkdebug/server",
- "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/lib/supplier/BUILD b/src/test/java/com/google/devtools/build/lib/supplier/BUILD
index 992c849..9a6c9a2 100644
--- a/src/test/java/com/google/devtools/build/lib/supplier/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/supplier/BUILD
@@ -16,7 +16,9 @@
srcs = glob(["*.java"]),
deps = [
"//src/main/java/com/google/devtools/build/lib/supplier",
- "//src/test/java/com/google/devtools/build/lib: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:TestSuite",
"//third_party:guava-testlib",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/BUILD b/src/test/java/com/google/devtools/build/lib/testutil/BUILD
new file mode 100644
index 0000000..664cf7b
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/testutil/BUILD
@@ -0,0 +1,200 @@
+# Description:
+# A grab-bag of testing utilities.
+
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+package(
+ default_testonly = 1,
+ default_visibility = [
+ "//src:__subpackages__",
+ "//tools:__subpackages__",
+ ],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+java_library(
+ name = "testutil",
+ testonly = 1,
+ srcs = [
+ "BazelTestSuiteBuilder.java",
+ "BlazeTestUtils.java",
+ "BuildRuleBuilder.java",
+ "BuildRuleWithDefaultsBuilder.java",
+ "DebuggingEventHandler.java",
+ "FakeAttributeMapper.java",
+ "FoundationTestCase.java",
+ "ManualClock.java",
+ "ManualSleeper.java",
+ "ManualSleeperTest.java",
+ "Scratch.java",
+ "Suite.java",
+ "TestFileOutErr.java",
+ "TestOnlyInNormalExecutionMode.java",
+ "TestRuleClassProvider.java",
+ "TestSpec.java",
+ "TimestampGranularityUtils.java",
+ "UnknownRuleConfiguredTarget.java",
+ ],
+ tags = ["avoid_dep"],
+ runtime_deps = ["//src/main/java/com/google/devtools/build/lib/unix"],
+ deps = [
+ ":JunitUtils",
+ ":TestConstants",
+ ":TestSuite",
+ ":TestUtils",
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//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/clock",
+ "//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/util/io",
+ "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
+ "//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:jsr305",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "BazelPackageBuilderHelperForTesting",
+ testonly = 0,
+ srcs = ["BazelPackageBuilderHelperForTesting.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/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",
+ "//third_party:guava",
+ ],
+)
+
+java_library(
+ name = "TestRunnableWrapper",
+ srcs = ["TestRunnableWrapper.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/concurrent",
+ "//third_party:guava",
+ ],
+)
+
+java_library(
+ name = "TestThread",
+ srcs = ["TestThread.java"],
+ deps = [
+ "//third_party:guava",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "TestUtils",
+ srcs = ["TestUtils.java"],
+)
+
+java_library(
+ name = "TestSuite",
+ srcs = [
+ "ClasspathSuite.java",
+ "CustomSuite.java",
+ "TestSuiteBuilder.java",
+ ],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:classpath-util",
+ "//third_party:guava",
+ "//third_party:junit4",
+ ],
+)
+
+java_library(
+ name = "EventUtils",
+ srcs = [
+ "EventIterableSubject.java",
+ "EventIterableSubjectFactory.java",
+ ],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:events",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "JunitUtils",
+ srcs = [
+ "MoreAsserts.java",
+ ],
+ deps = [
+ ":TestConstants",
+ "//src/main/java/com/google/devtools/build/lib:events",
+ "//src/main/java/com/google/devtools/build/lib:util",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+# Library exposing Blaze constants for TAP's usage.
+java_library(
+ name = "TestConstants",
+ srcs = [
+ "TestConstants.java",
+ ],
+ deps = [
+ ":PackageFactoryBuilderFactoryForBazelUnitTests",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/packages:builder_factory_for_testing",
+ "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//third_party:guava",
+ ],
+)
+
+java_library(
+ name = "PackageFactoryBuilderFactoryForBazelUnitTests",
+ srcs = ["PackageFactoryBuilderFactoryForBazelUnitTests.java"],
+ deps = [
+ ":BazelPackageBuilderHelperForTesting",
+ "//src/main/java/com/google/devtools/build/lib:build-base",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:builder_factory_for_testing",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ ],
+)
+
+java_library(
+ name = "TestUtilTests_lib",
+ srcs = [
+ "MoreAssertsTest.java",
+ "TestSizeAnnotationTest.java",
+ ],
+ deps = [
+ ":JunitUtils",
+ ":testutil",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "TestUtilTests",
+ size = "small",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":TestUtilTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/versioning/BUILD b/src/test/java/com/google/devtools/build/lib/versioning/BUILD
index 8e08e4d..96630c8 100644
--- a/src/test/java/com/google/devtools/build/lib/versioning/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/versioning/BUILD
@@ -17,7 +17,8 @@
"//src/main/java/com/google/devtools/build/lib/versioning",
"//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",
+ "//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",
],
@@ -29,7 +30,8 @@
srcs = ["SemVerTest.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/versioning",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//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",
],
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/BUILD b/src/test/java/com/google/devtools/build/lib/vfs/BUILD
new file mode 100644
index 0000000..608eea5
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/vfs/BUILD
@@ -0,0 +1,136 @@
+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(["**"]) + [
+ "//src/test/java/com/google/devtools/build/lib/vfs/util:srcs",
+ ],
+)
+
+# Tests for Windows-specific functionality that can run cross-platform.
+CROSS_PLATFORM_WINDOWS_TESTS = [
+ "PathFragmentWindowsTest.java",
+ "RootedPathAndCasingTest.java",
+ "WindowsPathTest.java",
+]
+
+# Tests for Windows-specific functionality that run on Windows.
+WINDOWS_ON_WINDOWS_TESTS = [
+]
+
+# All Windows-specific tests. Use this to exclude Windows tests from globs.
+ALL_WINDOWS_TESTS = CROSS_PLATFORM_WINDOWS_TESTS + WINDOWS_ON_WINDOWS_TESTS
+
+java_library(
+ name = "SymlinkAwareFileSystemTest",
+ srcs = ["SymlinkAwareFileSystemTest.java"],
+ deps = [
+ ":testutil",
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//src/main/java/com/google/devtools/build/lib:os_util",
+ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+ "//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_library(
+ name = "VfsTests_lib",
+ srcs = glob(
+ [
+ "*.java",
+ "inmemoryfs/*.java",
+ ],
+ exclude = ALL_WINDOWS_TESTS + [
+ "SymlinkAwareFileSystemTest.java",
+ ],
+ ),
+ deps = [
+ ":SymlinkAwareFileSystemTest",
+ ":testutil",
+ "//src/main/java/com/google/devtools/build/lib:build",
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
+ "//src/main/java/com/google/devtools/build/lib/unix",
+ "//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/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestThread",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ "//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "VfsTests",
+ size = "medium",
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":VfsTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+java_library(
+ name = "VfsWindowsTests_lib",
+ srcs = CROSS_PLATFORM_WINDOWS_TESTS + ["PathAbstractTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/clock",
+ "//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/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//third_party:guava",
+ "//third_party:guava-testlib",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+# Tests windows specific path handling on Unix.
+java_test(
+ name = "VfsWindowsTests",
+ size = "small",
+ jvm_flags = [
+ "-Dblaze.os=Windows",
+ "-Dbazel.windows_unix_root=C:/fake/msys",
+ ],
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":VfsWindowsTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+java_library(
+ name = "testutil",
+ testonly = 1,
+ srcs = ["FileSystemTest.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:util",
+ "//src/main/java/com/google/devtools/build/lib/unix",
+ "//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",
+ "//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",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/util/BUILD b/src/test/java/com/google/devtools/build/lib/vfs/util/BUILD
new file mode 100644
index 0000000..91f13d6
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/vfs/util/BUILD
@@ -0,0 +1,40 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+ default_testonly = 1,
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ testonly = 0,
+ srcs = glob(["*"]),
+)
+
+# Redirection for util lib to allow exporting both ":util_internal" and the
+# implementation of FileSystem as named in
+# src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+java_library(
+ name = "util",
+ exports = [
+ ":util_internal",
+ ],
+ runtime_deps = ["//src/main/java/com/google/devtools/build/lib:bazel-rules"],
+)
+
+java_library(
+ name = "util_internal",
+ testonly = 1,
+ srcs = glob(["*.java"]),
+ deps = [
+ "//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/clock",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
+ "//src/main/java/com/google/devtools/build/lib/windows",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/skydoc/BUILD b/src/test/java/com/google/devtools/build/skydoc/BUILD
index f73db4f..10ae50a 100644
--- a/src/test/java/com/google/devtools/build/skydoc/BUILD
+++ b/src/test/java/com/google/devtools/build/skydoc/BUILD
@@ -28,8 +28,9 @@
"//src/main/java/com/google/devtools/build/skydoc/fakebuildapi",
"//src/main/java/com/google/devtools/build/skydoc/rendering",
"//src/main/java/com/google/devtools/build/skydoc/rendering/proto:stardoc_output_java_proto",
- "//src/test/java/com/google/devtools/build/lib:testutil",
"//src/test/java/com/google/devtools/build/lib/skylark: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:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/skyframe/BUILD b/src/test/java/com/google/devtools/build/skyframe/BUILD
index 453afb4..11412cc 100644
--- a/src/test/java/com/google/devtools/build/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/skyframe/BUILD
@@ -1,5 +1,7 @@
load("@rules_java//java:defs.bzl", "java_library", "java_test")
+# Description:
+# Skyframe tests.
package(
default_testonly = 1,
default_visibility = ["//src:__subpackages__"],
@@ -9,7 +11,6 @@
name = "srcs",
testonly = 0,
srcs = glob(["**"]),
- visibility = ["//src:__pkg__"],
)
TESTUTIL_FILES = [
@@ -25,32 +26,29 @@
java_library(
name = "testutil",
srcs = TESTUTIL_FILES,
- visibility = [
- "//src/test/java/com/google/devtools/build/lib:__subpackages__",
- ],
deps = [
"//src/main/java/com/google/devtools/build/lib:events",
"//src/main/java/com/google/devtools/build/lib:util",
- "//src/main/java/com/google/devtools/build/lib/collect",
"//src/main/java/com/google/devtools/build/lib/concurrent",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
"//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:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
"//third_party:auto_value",
"//third_party:guava",
- "//third_party:guava-testlib",
"//third_party:jsr305",
"//third_party:truth",
],
)
java_test(
- name = "skyframe_base_test",
+ name = "skyframe_tests",
+ size = "medium",
srcs = glob(
["*.java"],
exclude = TESTUTIL_FILES,
),
+ shard_count = 2,
test_class = "com.google.devtools.build.skyframe.AllTests",
deps = [
":testutil",
@@ -61,7 +59,12 @@
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:graph_inconsistency_java_proto",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:EventUtils",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestRunnableWrapper",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestThread",
+ "//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
"//third_party:auto_value",
"//third_party:guava",
"//third_party:guava-testlib",
@@ -78,7 +81,6 @@
"-no_windows",
"-slow",
],
- visibility = ["//visibility:private"],
)
test_suite(
@@ -86,5 +88,4 @@
tests = [
":windows_tests",
],
- visibility = ["//src:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/common/options/BUILD b/src/test/java/com/google/devtools/common/options/BUILD
index faf25aa..1152fbc 100644
--- a/src/test/java/com/google/devtools/common/options/BUILD
+++ b/src/test/java/com/google/devtools/common/options/BUILD
@@ -49,7 +49,9 @@
"//src/main/java/com/google/devtools/common/options/testing",
"//src/main/protobuf:invocation_policy_java_proto",
"//src/main/protobuf:option_filters_java_proto",
- "//src/test/java/com/google/devtools/build/lib: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:TestSuite",
"//third_party:flogger",
"//third_party:guava",
"//third_party:guava-testlib",
diff --git a/src/test/java/com/google/devtools/common/options/testing/BUILD b/src/test/java/com/google/devtools/common/options/testing/BUILD
index e6d77f1..37b2946 100644
--- a/src/test/java/com/google/devtools/common/options/testing/BUILD
+++ b/src/test/java/com/google/devtools/common/options/testing/BUILD
@@ -24,7 +24,9 @@
deps = [
"//src/main/java/com/google/devtools/common/options",
"//src/main/java/com/google/devtools/common/options/testing",
- "//src/test/java/com/google/devtools/build/lib: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:TestSuite",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:junit4",
diff --git a/tools/java/runfiles/testing/BUILD b/tools/java/runfiles/testing/BUILD
index 2d5a50a..2f8e988 100644
--- a/tools/java/runfiles/testing/BUILD
+++ b/tools/java/runfiles/testing/BUILD
@@ -20,7 +20,8 @@
test_class = "com.google.devtools.build.runfiles.RunfilesTest",
deps = [
":test_deps",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
],
)
@@ -30,7 +31,8 @@
test_class = "com.google.devtools.build.runfiles.UtilTest",
deps = [
":test_deps",
- "//src/test/java/com/google/devtools/build/lib:testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil",
+ "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
],
)
