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

1 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java
index e9d7dee66f..e06b6c4f1b 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java
@@ -30,6 +30,7 @@ import com.google.devtools.build.lib.analysis.test.TestActionContext;
 import com.google.devtools.build.lib.analysis.test.TestRunnerAction;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.exec.ExecutionOptions;
+import com.google.devtools.build.lib.exec.StandaloneTestResult;
 import com.google.devtools.build.lib.exec.StandaloneTestStrategy;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.vfs.Path;
@@ -76,10 +77,8 @@ public class WorkerTestStrategy extends StandaloneTestStrategy {
   }
 
   @Override
-  protected TestResultData executeTest(
-      TestRunnerAction action,
-      Spawn spawn,
-      ActionExecutionContext actionExecutionContext)
+  protected StandaloneTestResult executeTest(
+      TestRunnerAction action, Spawn spawn, ActionExecutionContext actionExecutionContext)
       throws ExecException, InterruptedException, IOException {
     if (!action.getConfiguration().compatibleWithStrategy("experimental_worker")) {
       throw new UserExecException(
@@ -108,7 +107,7 @@ public class WorkerTestStrategy extends StandaloneTestStrategy {
         actionExecutionContext.getExecRoot());
   }
 
-  private TestResultData execInWorker(
+  private StandaloneTestResult execInWorker(
       TestRunnerAction action,
       Spawn spawn,
       ActionExecutionContext actionExecutionContext,
@@ -214,7 +213,7 @@ public class WorkerTestStrategy extends StandaloneTestStrategy {
         builder.setTestCase(details);
       }
 
-      return builder.build();
+      return StandaloneTestResult.create(ImmutableSet.of(), builder.build());
     } catch (IOException | InterruptedException e) {
       if (worker != null) {
         workerPool.invalidateObject(key, worker);