diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/standalone/LinuxSandboxedStrategy.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/standalone/NamespaceSandboxRunner.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/LinuxSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/LinuxSandboxedStrategy.java index dc32ddc806..79c68942bc 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/LinuxSandboxedStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/LinuxSandboxedStrategy.java @@ -99,7 +99,7 @@ public class LinuxSandboxedStrategy implements SpawnActionContext { } NamespaceSandboxRunner runner = new NamespaceSandboxRunner(directories, spawn, includePrefix, - includeDirectories, spawn.getRunfilesManifests()); + includeDirectories, spawn.getRunfilesManifests(), verboseFailures); runner.setupSandbox(expandedInputs, spawn.getOutputFiles()); runner.run(spawnArguments, spawn.getEnvironment(), new File(cwd), outErr); runner.copyOutputs(spawn.getOutputFiles(), outErr); diff --git a/src/main/java/com/google/devtools/build/lib/standalone/NamespaceSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/standalone/NamespaceSandboxRunner.java index 3c7a8e0ad8..e43a7d17d2 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/NamespaceSandboxRunner.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/NamespaceSandboxRunner.java @@ -45,7 +45,7 @@ import java.util.Map.Entry; * changes invocation if necessary. */ public class NamespaceSandboxRunner { - private final boolean debug = true; + private final boolean debug; private final PathFragment sandboxDirectory; private final Path sandboxPath; private final List<String> mounts; @@ -58,11 +58,12 @@ public class NamespaceSandboxRunner { public NamespaceSandboxRunner(BlazeDirectories directories, Spawn spawn, PathFragment includePrefix, List<PathFragment> includeDirectories, - ImmutableMap<PathFragment, Artifact> manifests) { + ImmutableMap<PathFragment, Artifact> manifests, boolean debug) { String md5sum = Fingerprint.md5Digest(spawn.getResourceOwner().getPrimaryOutput().toString()); this.sandboxDirectory = new PathFragment("sandbox-root-" + md5sum); this.sandboxPath = directories.getExecRoot().getRelative("sandboxes").getRelative(sandboxDirectory); + this.debug = debug; this.mounts = new ArrayList<>(); this.tools = directories.getExecRoot().getChild("tools"); this.embeddedBinaries = directories.getEmbeddedBinariesRoot(); |