diff options
| author |  ruperts <ruperts@google.com> | 2017-10-07 00:46:20 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-10-07 11:07:30 +0200 |
| commit | 4050a89a1e3fb6a9a9c6bd080cf4e3081a9f2012 (patch) | |
| tree | 0df531d72015ad33f3a6c8ff670846808714e8bd /src/test/java/com/google/devtools/build/lib/standalone | |
| parent | 5f39475bb51f48182180e34e4310edb650bea462 (diff) | |
More SpawnResult-related plumbing changes to Actions, Strategies, ActionContexts, etc., so that SpawnResult metadata is returned upwards.
Note that the TODOs mostly refer to changes that will appear in a subsequent CL (a CL to return SpawnResults, contained in ActionResults, from Actions/AbstractActions). I split off the remaining SpawnResult-related changes into this CL and kept the ActionResult-related changes separate.
RELNOTES: None.
PiperOrigin-RevId: 171355611
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/standalone')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java index 85fd06583f..5372dcd826 100644 --- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnActionContext; +import com.google.devtools.build.lib.actions.SpawnResult; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ServerDirectories; @@ -59,6 +60,7 @@ import com.google.devtools.common.options.OptionsParser; import java.io.IOException; import java.util.Arrays; import java.util.Collection; +import java.util.Set; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -167,9 +169,10 @@ public class StandaloneSpawnStrategyTest { assertThat(err()).isEmpty(); } - private void run(Spawn spawn) throws Exception { - executor.getSpawnActionContext(spawn.getMnemonic()).exec(spawn, createContext()); + private Set<SpawnResult> run(Spawn spawn) throws Exception { + return executor.getSpawnActionContext(spawn.getMnemonic()).exec(spawn, createContext()); } + private ActionExecutionContext createContext() { Path execRoot = executor.getExecRoot(); return new ActionExecutionContext( |