commit 580038ec43b52c00ec704b1ff139924a6575ba20
author buchgr <buchgr@google.com> Mon Sep 02 02:16:19 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Sep 02 02:17:44 2019 -0700
tree 4d83e0d737c9a9c339b7112ff2d34e381204920a
parent 1afb510bc7e6699bbad998bddb3e97bf36adeb0c

Roll Forward: Remove on-demand runfile tree creation from test strategy
RELNOTES: None

PiperOrigin-RevId: 266741971

src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index bbe2c3d..b86c305 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -23,6 +23,7 @@
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionInputHelper;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.ArtifactPathResolver;
 import com.google.devtools.build.lib.actions.ExecException;
 import com.google.devtools.build.lib.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.actions.ExecutionStrategy;
@@ -32,6 +33,7 @@
 import com.google.devtools.build.lib.actions.SpawnActionContext;
 import com.google.devtools.build.lib.actions.SpawnContinuation;
 import com.google.devtools.build.lib.actions.SpawnResult;
+import com.google.devtools.build.lib.actions.TestExecException;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.test.TestActionContext;
 import com.google.devtools.build.lib.analysis.test.TestResult;
@@ -92,20 +94,14 @@
 
   @Override
   public TestRunnerSpawn createTestRunnerSpawn(
-      TestRunnerAction action, ActionExecutionContext actionExecutionContext)
-      throws ExecException, InterruptedException {
+      TestRunnerAction action, ActionExecutionContext actionExecutionContext) throws ExecException {
+    if (action.getExecutionSettings().getInputManifest() == null) {
+      throw new TestExecException("cannot run local tests with --nobuild_runfile_manifests");
+    }
     Path execRoot = actionExecutionContext.getExecRoot();
-    Path runfilesDir =
-        getLocalRunfilesDirectory(
-            action,
-            actionExecutionContext,
-            binTools,
-            action.getLocalShellEnvironment(),
-            action.isEnableRunfiles());
-    Path tmpDir =
-        actionExecutionContext
-            .getPathResolver()
-            .convertPath(tmpDirRoot.getChild(TestStrategy.getTmpDirName(action)));
+    ArtifactPathResolver pathResolver = actionExecutionContext.getPathResolver();
+    Path runfilesDir = pathResolver.convertPath(action.getExecutionSettings().getRunfilesDir());
+    Path tmpDir = pathResolver.convertPath(tmpDirRoot.getChild(TestStrategy.getTmpDirName(action)));
     Map<String, String> env = setupEnvironment(
         action, actionExecutionContext.getClientEnv(), execRoot, runfilesDir, tmpDir);
     if (executionOptions.splitXmlGeneration) {