diff options
| author |  ruperts <ruperts@google.com> | 2017-10-18 00:58:29 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-18 10:28:27 +0200 |
| commit | 841880dc66bfd0702a08105835a445cb3dc271c9 (patch) | |
| tree | 758c9178d16f161ed19313a7f0d082c19a4a6db5 /src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | |
| parent | 34a9fea78f201caed8ace5c714a0cf288cb97c65 (diff) | |
Actions now have the option of returning an ActionResult, containing a (possibly empty) set of SpawnResults created during execution of the Action.
RELNOTES: None.
PiperOrigin-RevId: 172529328
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index 688d2aaa94..cd19919d47 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -28,6 +28,7 @@ import com.google.devtools.build.lib.actions.ActionExecutionException; import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ActionInputHelper; import com.google.devtools.build.lib.actions.ActionOwner; +import com.google.devtools.build.lib.actions.ActionResult; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; import com.google.devtools.build.lib.actions.BaseSpawn; @@ -262,11 +263,10 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie } @Override - public void execute(ActionExecutionContext actionExecutionContext) + public ActionResult execute(ActionExecutionContext actionExecutionContext) throws ActionExecutionException, InterruptedException { try { - // TODO(b/62588075): internalExecute() now returns a set of SpawnResults, we could capture it. - internalExecute(actionExecutionContext); + return ActionResult.create(internalExecute(actionExecutionContext)); } catch (ExecException e) { String failMessage; if (isShellCommand()) { |