Turn the "sandbox" directory into a package.
RELNOTES: None.
PiperOrigin-RevId: 277590911
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 06e1d7d..b6c021d 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -234,7 +234,7 @@
- "-//src/test/shell/bazel:maven_test"
- "-//src/test/shell/bazel:bazel_repository_cache_test"
- "-//src/test/shell/integration:java_integration_test"
- - "-//src/test/java/com/google/devtools/build/lib:sandbox-tests"
+ - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
# See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
- "-//src/java_tools/buildjar/..."
- "-//src/java_tools/import_deps_checker/..."
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
index 7e398e2..b9f9722 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -5,10 +5,6 @@
filegroup(
name = "srcs",
srcs = glob(["**"]),
- visibility = [
- "//src/main/java/com/google/devtools/build/lib:__pkg__",
- "//src/test/shell/bazel:__pkg__",
- ],
)
java_library(
@@ -22,7 +18,7 @@
"//src/main/java/com/google/devtools/build/lib:command-utils",
"//src/main/java/com/google/devtools/build/lib:events",
"//src/main/java/com/google/devtools/build/lib:io",
- "//src/main/java/com/google/devtools/build/lib:out-err",
+ "//src/main/java/com/google/devtools/build/lib:os_util",
"//src/main/java/com/google/devtools/build/lib:process_util",
"//src/main/java/com/google/devtools/build/lib:resource-converter",
"//src/main/java/com/google/devtools/build/lib:runtime",
@@ -37,12 +33,13 @@
"//src/main/java/com/google/devtools/build/lib/shell",
"//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/main/java/com/google/devtools/common/options",
"//third_party:auto_value",
- "//third_party:gson",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf:protobuf_java",
"@remoteapis//:build_bazel_remote_execution_v2_remote_execution_java_proto",
+ "//third_party:gson",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index f80de33..f532719 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -66,6 +66,7 @@
"//src/test/java/com/google/devtools/build/lib/rules/platform:srcs",
"//src/test/java/com/google/devtools/build/lib/rules/python:srcs",
"//src/test/java/com/google/devtools/build/lib/rules/repository:srcs",
+ "//src/test/java/com/google/devtools/build/lib/sandbox:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe/packages:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
@@ -1288,75 +1289,6 @@
],
)
-java_library(
- name = "sandboxfs-base-tests",
- testonly = 1,
- srcs = ["sandbox/BaseSandboxfsProcessIntegrationTest.java"],
- deps = [
- ":testutil",
- "//src/main/java/com/google/devtools/build/lib/sandbox",
- "//src/main/java/com/google/devtools/build/lib/vfs",
- "//third_party:guava",
- "//third_party:junit4",
- "//third_party:truth",
- ],
-)
-
-java_test(
- name = "sandbox-tests",
- srcs = glob(
- ["sandbox/*.java"],
- exclude = [
- "sandbox/BaseSandboxfsProcessIntegrationTest.java",
- "sandbox/RealSandboxfsProcessIntegrationTest.java",
- ],
- ),
- data = [":embedded_scripts"],
- local = 1,
- tags = ["no_windows"],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":analysis_testutil",
- ":foundations_testutil",
- ":guava_junit_truth",
- ":sandboxfs-base-tests",
- ":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: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/sandbox",
- "//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/common/options",
- ],
-)
-
-java_test(
- name = "sandboxfs-integration-tests",
- srcs = ["sandbox/RealSandboxfsProcessIntegrationTest.java"],
- data = [":embedded_scripts"],
- local = 1,
- tags = [
- # On macOS:
- # sudo sysctl -w vfs.generic.osxfuse.tunables.allow_other=1
- # Test requires:
- # --test_env=SANDBOXFS=/path/to/sandboxfs
- "manual",
- "no-sandbox",
- "no_windows",
- ],
- test_class = "com.google.devtools.build.lib.AllTests",
- deps = [
- ":sandboxfs-base-tests",
- ":test_runner",
- "//src/main/java/com/google/devtools/build/lib/sandbox",
- "//src/main/java/com/google/devtools/build/lib/vfs",
- "//third_party:junit4",
- ],
-)
-
java_test(
name = "standalone-tests",
srcs = glob(["standalone/*.java"]),
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/BUILD b/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
new file mode 100644
index 0000000..1809fe1
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -0,0 +1,96 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+package(
+ default_visibility = ["//src:__subpackages__"],
+)
+
+filegroup(
+ name = "srcs",
+ srcs = glob(["**"]),
+)
+
+java_library(
+ name = "testutil",
+ testonly = 1,
+ srcs = ["FakeSandboxfsProcess.java"],
+ deps = [
+ "//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",
+ "//third_party:guava",
+ ],
+)
+
+java_library(
+ name = "sandboxfs-base-tests",
+ testonly = 1,
+ srcs = ["BaseSandboxfsProcessIntegrationTest.java"],
+ deps = [
+ "//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",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_library(
+ name = "SandboxTests_lib",
+ testonly = 1,
+ srcs = glob(
+ ["*.java"],
+ exclude = [
+ "BaseSandboxfsProcessIntegrationTest.java",
+ "FakeSandboxfsProcess.java",
+ "RealSandboxfsProcessIntegrationTest.java",
+ ],
+ ),
+ deps = [
+ ":sandboxfs-base-tests",
+ ":testutil",
+ "//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/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",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
+
+java_test(
+ name = "SandboxTests",
+ size = "medium",
+ data = ["//src/test/java/com/google/devtools/build/lib:embedded_scripts"],
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ ":SandboxTests_lib",
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+)
+
+java_test(
+ name = "sandboxfs-integration-tests",
+ srcs = ["RealSandboxfsProcessIntegrationTest.java"],
+ data = ["//src/test/java/com/google/devtools/build/lib:embedded_scripts"],
+ local = 1,
+ tags = [
+ "manual", # Test requires: --test_env=SANDBOXFS=/path/to/sandboxfs
+ "no-sandbox",
+ "no_windows",
+ ],
+ test_class = "com.google.devtools.build.lib.AllTests",
+ runtime_deps = [
+ "//src/test/java/com/google/devtools/build/lib:test_runner",
+ ],
+ deps = [
+ ":sandboxfs-base-tests",
+ "//src/main/java/com/google/devtools/build/lib/sandbox",
+ "//src/main/java/com/google/devtools/build/lib/vfs",
+ "//third_party:junit4",
+ ],
+)
