Rename namespace-sandbox/-runner to linux-sandbox.
--
MOS_MIGRATED_REVID=127538990
diff --git a/src/BUILD b/src/BUILD
index 0547c5f..392c944 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -26,7 +26,7 @@
":libunix",
"//src/main/tools:build-runfiles",
"//src/main/tools:process-wrapper",
- "//src/main/tools:namespace-sandbox",
+ "//src/main/tools:linux-sandbox",
"//src/main/tools:build_interface_so",
"//src/tools/xcode/xcodelocator:xcode-locator",
] + embedded_tools,
@@ -183,7 +183,7 @@
"//src/main/tools:build-runfiles",
"//src/main/tools:process-wrapper",
"//src/main/tools:jdk-support",
- "//src/main/tools:namespace-sandbox",
+ "//src/main/tools:linux-sandbox",
"//src/main/tools:build_interface_so",
"//src/tools/xcode/xcodelocator:xcode-locator",
":java-version",
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 1fe3fba..6071bfc 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -6,7 +6,7 @@
name = "sandbox",
srcs = glob(["*.java"]),
data = [
- "//src/main/tools:namespace-sandbox",
+ "//src/main/tools:linux-sandbox",
],
deps = [
"//src/main/java/com/google/devtools/build/lib:build-base",
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxRunner.java
similarity index 94%
rename from src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
rename to src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxRunner.java
index 9516fe2..bae4ec9 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxRunner.java
@@ -31,7 +31,6 @@
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
-
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -40,12 +39,11 @@
import java.util.List;
/**
- * Helper class for running the namespace sandbox. This runner prepares environment inside the
- * sandbox, handles sandbox output, performs cleanup and changes invocation if necessary.
+ * Helper class for running the Linux sandbox. This runner prepares environment inside the sandbox,
+ * handles sandbox output, performs cleanup and changes invocation if necessary.
*/
-public class NamespaceSandboxRunner {
- private static final String NAMESPACE_SANDBOX =
- "namespace-sandbox" + OsUtils.executableExtension();
+public class LinuxSandboxRunner {
+ private static final String LINUX_SANDBOX = "linux-sandbox" + OsUtils.executableExtension();
private static final String SANDBOX_TIP =
"\n\nSandboxed execution failed, which may be legitimate (e.g. a compiler error), "
+ "or due to missing dependencies. To enter the sandbox environment for easier debugging,"
@@ -60,7 +58,7 @@
private final boolean verboseFailures;
private final boolean sandboxDebug;
- public NamespaceSandboxRunner(
+ public LinuxSandboxRunner(
Path execRoot,
Path sandboxPath,
ImmutableMap<Path, Path> mounts,
@@ -82,7 +80,7 @@
Path execRoot = commandEnv.getExecRoot();
PathFragment embeddedTool =
- commandEnv.getBlazeWorkspace().getBinTools().getExecPath(NAMESPACE_SANDBOX);
+ commandEnv.getBlazeWorkspace().getBinTools().getExecPath(LINUX_SANDBOX);
if (embeddedTool == null) {
// The embedded tool does not exist, meaning that we don't support sandboxing (e.g., while
// bootstrapping).
@@ -135,7 +133,7 @@
List<String> fileArgs = new ArrayList<>();
List<String> commandLineArgs = new ArrayList<>();
- commandLineArgs.add(execRoot.getRelative("_bin/namespace-sandbox").getPathString());
+ commandLineArgs.add(execRoot.getRelative("_bin/linux-sandbox").getPathString());
if (sandboxDebug) {
fileArgs.add("-D");
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
index dadd569..9a04ed8 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
@@ -49,7 +49,6 @@
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.lib.vfs.SearchPath;
import com.google.devtools.build.lib.vfs.Symlinks;
-
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -155,8 +154,8 @@
}
try {
- final NamespaceSandboxRunner runner =
- new NamespaceSandboxRunner(
+ final LinuxSandboxRunner runner =
+ new LinuxSandboxRunner(
execRoot,
sandboxPath,
mounts,
@@ -217,7 +216,7 @@
/**
* Most programs expect certain directories to be present, e.g. /tmp. Make sure they are.
*
- * <p>Note that $HOME is handled by namespace-sandbox.c, because it changes user to nobody and the
+ * <p>Note that $HOME is handled by linux-sandbox.c, because it changes user to nobody and the
* home directory of that user is not known by us.
*/
private ImmutableSet<Path> createImportantDirs(Map<String, String> env) {
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java
index 04f6169..be3dc04 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java
@@ -27,7 +27,6 @@
import com.google.devtools.build.lib.util.OS;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.common.options.OptionsBase;
-
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -50,7 +49,7 @@
private synchronized boolean isSandboxingSupported(CommandEnvironment env) {
if (sandboxingSupported == null) {
- sandboxingSupported = NamespaceSandboxRunner.isSupported(env);
+ sandboxingSupported = LinuxSandboxRunner.isSupported(env);
}
return sandboxingSupported.booleanValue();
}
diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD
index de5ec21..ead4168 100644
--- a/src/main/tools/BUILD
+++ b/src/main/tools/BUILD
@@ -29,13 +29,13 @@
)
cc_binary(
- name = "namespace-sandbox",
+ name = "linux-sandbox",
srcs = select({
- "//src:darwin": ["namespace-sandbox-dummy.c"],
- "//src:darwin_x86_64": ["namespace-sandbox-dummy.c"],
- "//src:freebsd": ["namespace-sandbox-dummy.c"],
- "//src:windows": ["namespace-sandbox-dummy.c"],
- "//conditions:default": ["namespace-sandbox.c"],
+ "//src:darwin": ["dummy-sandbox.c"],
+ "//src:darwin_x86_64": ["dummy-sandbox.c"],
+ "//src:freebsd": ["dummy-sandbox.c"],
+ "//src:windows": ["dummy-sandbox.c"],
+ "//conditions:default": ["linux-sandbox.c"],
}),
copts = ["-std=c99"],
linkopts = ["-lm"],
diff --git a/src/main/tools/namespace-sandbox-dummy.c b/src/main/tools/dummy-sandbox.c
similarity index 62%
rename from src/main/tools/namespace-sandbox-dummy.c
rename to src/main/tools/dummy-sandbox.c
index 8c082c5..e8ba6b5 100644
--- a/src/main/tools/namespace-sandbox-dummy.c
+++ b/src/main/tools/dummy-sandbox.c
@@ -12,12 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// This is a dummy file to compile on platforms where namespace sandboxing
-// doesn't work (ie. other than Linux). We need this for main/tools/BUILD file
-// - we can't restrict visibility of namespace-sandbox based on platform;
-// instead bazel build main/tools:namespace-sandbox is a no-op on non supported
-// platforms (if we didn't have this file, it would fail with a non-informative
-// message)
+// This is a dummy file to compile on platforms where sandboxing doesn't work.
+// We need this for main/tools/BUILD file - we can't restrict visibility of
+// linux-sandbox based on platform; instead bazel build
+// main/tools:linux-sandbox is a no-op on non supported platforms (if we didn't
+// have this file, it would fail with a non-informative message)
int main(int argc, char *argv[]) {
return 1;
diff --git a/src/main/tools/namespace-sandbox.c b/src/main/tools/linux-sandbox.c
similarity index 100%
rename from src/main/tools/namespace-sandbox.c
rename to src/main/tools/linux-sandbox.c
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 42b06d7..446712a 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -21,7 +21,7 @@
data = [
"//src/main/tools:build-runfiles",
"//src/main/tools:build_interface_so",
- "//src/main/tools:namespace-sandbox",
+ "//src/main/tools:linux-sandbox",
"//src/main/tools:process-wrapper",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/LocalLinuxSandboxedStrategyTest.java b/src/test/java/com/google/devtools/build/lib/sandbox/LocalLinuxSandboxedStrategyTest.java
index 34ce54f..bd3e830 100644
--- a/src/test/java/com/google/devtools/build/lib/sandbox/LocalLinuxSandboxedStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/LocalLinuxSandboxedStrategyTest.java
@@ -29,17 +29,15 @@
import com.google.devtools.build.lib.testutil.TestSpec;
import com.google.devtools.build.lib.util.OS;
import com.google.devtools.build.lib.vfs.Path;
-
+import java.util.Arrays;
+import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import java.util.Arrays;
-import java.util.Map;
-
/**
- * Tests for {@code LinuxSandboxedStrategy} that must run locally, because they need to actually
- * run the namespace-sandbox binary.
+ * Tests for {@code LinuxSandboxedStrategy} that must run locally, because they need to actually run
+ * the linux-sandbox binary.
*/
@TestSpec(localOnly = true, supportedOs = OS.LINUX)
@RunWith(JUnit4.class)
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index b240a65..8db1105 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -33,7 +33,7 @@
public static final ImmutableList<String> EMBEDDED_TOOLS = ImmutableList.of(
"build_interface_so",
"build-runfiles",
- "namespace-sandbox",
+ "linux-sandbox",
"process-wrapper",
"xcode-locator");
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index f70d852..7e1f4e6 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -65,7 +65,7 @@
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
"//src/java_tools/singlejar:SingleJar_deploy.jar",
- "//src/main/tools:namespace-sandbox",
+ "//src/main/tools:linux-sandbox",
"//src/main/tools:process-wrapper",
"//src/test/shell:bashunit",
"//third_party:srcs",
@@ -283,9 +283,9 @@
)
sh_test(
- name = "namespace_runner_test",
+ name = "linux_sandbox_test",
size = "large",
- srcs = ["namespace-runner_test.sh"],
+ srcs = ["linux-sandbox_test.sh"],
data = [":test-deps"],
)
diff --git a/src/test/shell/bazel/bazel_sandboxing_test_utils.sh b/src/test/shell/bazel/bazel_sandboxing_test_utils.sh
index 77e17f5..f442ece 100755
--- a/src/test/shell/bazel/bazel_sandboxing_test_utils.sh
+++ b/src/test/shell/bazel/bazel_sandboxing_test_utils.sh
@@ -23,7 +23,7 @@
}
function check_sandbox_allowed {
- $namespace_sandbox -C || {
+ $linux_sandbox -C || {
echo "Sandboxing disabled or not supported on this system, skipping..."
return 1
}
diff --git a/src/test/shell/bazel/namespace-runner_test.sh b/src/test/shell/bazel/linux-sandbox_test.sh
similarity index 70%
rename from src/test/shell/bazel/namespace-runner_test.sh
rename to src/test/shell/bazel/linux-sandbox_test.sh
index da6857b..ad2b4ae 100755
--- a/src/test/shell/bazel/namespace-runner_test.sh
+++ b/src/test/shell/bazel/linux-sandbox_test.sh
@@ -49,66 +49,66 @@
}
function test_basic_functionality() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/echo hi there || fail
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/echo hi there || fail
assert_output "hi there" ""
}
function test_default_user_is_nobody() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /usr/bin/id || fail
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /usr/bin/id || fail
assert_output "uid=65534 gid=65534 groups=65534" ""
}
function test_user_switched_to_root() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -r -l $OUT -L $ERR -- /usr/bin/id || fail
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -r -l $OUT -L $ERR -- /usr/bin/id || fail
assert_contains "uid=0 gid=0" "$OUT"
}
function test_network_namespace() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -n -l $OUT -L $ERR -- /bin/ip link ls || fail
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -n -l $OUT -L $ERR -- /bin/ip link ls || fail
assert_contains "LOOPBACK,UP" "$OUT"
}
function test_ping_loopback() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -n -r -l $OUT -L $ERR -- /bin/ping -c 1 127.0.0.1 || fail
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -n -r -l $OUT -L $ERR -- /bin/ping -c 1 127.0.0.1 || fail
assert_contains "1 received" "$OUT"
}
function test_to_stderr() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/bash -c "/bin/echo hi there >&2" || fail
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/bash -c "/bin/echo hi there >&2" || fail
assert_output "" "hi there"
}
function test_exit_code() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/bash -c "exit 71" || code=$?
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/bash -c "exit 71" || code=$?
assert_equals 71 "$code"
}
function test_signal_death() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/bash -c 'kill -ABRT $$' || code=$?
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -l $OUT -L $ERR -- /bin/bash -c 'kill -ABRT $$' || code=$?
assert_equals 134 "$code" # SIGNAL_BASE + SIGABRT = 128 + 6
}
function test_signal_catcher() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -T 2 -t 3 -l $OUT -L $ERR -- /bin/bash -c \
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -T 2 -t 3 -l $OUT -L $ERR -- /bin/bash -c \
'trap "echo later; exit 0" SIGINT SIGTERM SIGALRM; sleep 1000' || code=$?
assert_equals 142 "$code" # SIGNAL_BASE + SIGALRM = 128 + 14
assert_stdout "later"
}
function test_basic_timeout() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -T 3 -t 3 -l $OUT -L $ERR -- /bin/bash -c "echo before; sleep 1000; echo after" && fail
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -T 3 -t 3 -l $OUT -L $ERR -- /bin/bash -c "echo before; sleep 1000; echo after" && fail
assert_output "before" ""
}
function test_timeout_grace() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -T 2 -t 3 -l $OUT -L $ERR -- /bin/bash -c \
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -T 2 -t 3 -l $OUT -L $ERR -- /bin/bash -c \
'trap "echo -n before; sleep 1; echo -n after; exit 0" SIGINT SIGTERM SIGALRM; sleep 1000' || code=$?
assert_equals 142 "$code" # SIGNAL_BASE + SIGALRM = 128 + 14
assert_stdout "beforeafter"
}
function test_timeout_kill() {
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -T 2 -t 3 -l $OUT -L $ERR -- /bin/bash -c \
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -T 2 -t 3 -l $OUT -L $ERR -- /bin/bash -c \
'trap "echo before; sleep 1000; echo after; exit 0" SIGINT SIGTERM SIGALRM; sleep 1000' || code=$?
assert_equals 142 "$code" # SIGNAL_BASE + SIGALRM = 128 + 14
assert_stdout "before"
@@ -116,7 +116,7 @@
function test_debug_logging() {
touch ${TEST_TMPDIR}/testfile
- $namespace_sandbox $SANDBOX_DEFAULT_OPTS -D -M ${TEST_TMPDIR}/testfile -m /tmp/sandboxed_testfile -l $OUT -L $ERR -- /bin/true || code=$?
+ $linux_sandbox $SANDBOX_DEFAULT_OPTS -D -M ${TEST_TMPDIR}/testfile -m /tmp/sandboxed_testfile -l $OUT -L $ERR -- /bin/true || code=$?
assert_contains "mount: /usr/bin\$" "$ERR"
assert_contains "mount: ${TEST_TMPDIR}/testfile -> <sandbox>/tmp/sandboxed_testfile\$" "$ERR"
}
@@ -125,4 +125,4 @@
check_supported_platform || exit 0
check_sandbox_allowed || exit 0
-run_suite "namespace-runner"
+run_suite "linux-sandbox"
diff --git a/src/test/shell/bazel/testenv.sh b/src/test/shell/bazel/testenv.sh
index 594a826..b38251f 100755
--- a/src/test/shell/bazel/testenv.sh
+++ b/src/test/shell/bazel/testenv.sh
@@ -76,7 +76,7 @@
# Sandbox tools
process_wrapper="${BAZEL_RUNFILES}/src/main/tools/process-wrapper"
-namespace_sandbox="${BAZEL_RUNFILES}/src/main/tools/namespace-sandbox"
+linux_sandbox="${BAZEL_RUNFILES}/src/main/tools/linux-sandbox"
# iOS and Objective-C tooling
iossim_path="${BAZEL_RUNFILES}/third_party/iossim/iossim"
