aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
diff options
context:
space:
mode:
authorGravatar ulfjack <ulfjack@google.com>2017-07-14 17:39:46 +0200
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-07-17 10:10:47 +0200
commit9f18a511205fbd74e188f0d42974fe329b9cffe6 (patch)
treef93c18285bbbed5d59efbe6341fe6ab006b4822b /src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
parent33bd2570b7e942eaf13145c66adc53f223c0b80b (diff)
Simplify exception handling in spawn strategies
The main change here is to only catch SpawnExecException in StandaloneTestStrategy, so all other exceptions simplify propagate up. As a result, Bazel no longer retries tests that fail with an exception, we only retry tests that actually ran, had a spawn result, and resulted in a UserExecException. That is probably what we want. Also do some cleanup: - Remove ExecException.timedOut; nobody was calling it (but there's still SpawnExecException.timedOut) - Remove SpawnActionContext.shouldPropagateExecException; all exceptions (except SpawnExecException) are now propagated by default - Remote the SandboxOptions from the SandboxStrategies; all sandboxing options are now handled by the underlying SpawnRunner implementations I'll send a followup CL to remove the UserExecException and EnvironmentalExecException types; the types don't do anything special, and there are no catch blocks in production code that catch one of these more specific types. This should fix #3322 by removing a bunch of special handling. PiperOrigin-RevId: 161960919
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
index 38c8645f2c..29b572fe53 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
@@ -36,7 +36,6 @@ final class DarwinSandboxedStrategy extends SandboxStrategy {
String productName) throws IOException {
super(
verboseFailures,
- buildRequest.getOptions(SandboxOptions.class),
new DarwinSandboxedSpawnRunner(cmdEnv, buildRequest, sandboxBase, productName));
}
}