Get runfiles prefix from the WORKSPACE file

--
MOS_MIGRATED_REVID=87513766

5 files changed, 24 insertions, 22 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
index 4fb0da35d8..2a6b77f5ec 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.FileProvider;
@@ -128,7 +127,7 @@ public class JavaBinary implements RuleConfiguredTargetFactory {
     List<Artifact> nativeLibraries = attributes.getNativeLibraries();
     if (!nativeLibraries.isEmpty()) {
       jvmFlags.add("-Djava.library.path="
-          + JavaCommon.javaLibraryPath(nativeLibraries, Constants.RUNFILES_PREFIX));
+          + JavaCommon.javaLibraryPath(nativeLibraries, ruleContext.getRule().getWorkspaceName()));
     }
 
     JavaConfiguration javaConfig = ruleContext.getFragment(JavaConfiguration.class);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index c260459133..54f0976cc5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
-import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
@@ -346,8 +345,8 @@ public class JavaCommon {
       javaExecutable = ruleContext.getFragment(Jvm.class).getJavaExecutable();
     }
 
-    String pathPrefix =
-        javaExecutable.isAbsolute() ? "" : "${JAVA_RUNFILES}/" + Constants.RUNFILES_PREFIX + "/";
+    String pathPrefix = javaExecutable.isAbsolute() ? "" : "${JAVA_RUNFILES}/"
+        + ruleContext.getRule().getWorkspaceName() + "/";
     return "JAVABIN=${JAVABIN:-" + pathPrefix + javaExecutable.getPathString() + "}";
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
index d0ff9573fc..aff00873a7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
@@ -33,7 +33,6 @@ import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.util.io.FileOutErr;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
-import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus;
 import com.google.devtools.build.lib.view.test.TestStatus.TestCase;
 import com.google.devtools.build.lib.view.test.TestStatus.TestResultData;
@@ -52,20 +51,15 @@ import java.util.Map;
 public class StandaloneTestStrategy extends TestStrategy {
   /*
     TODO(bazel-team):
-
     * tests
     * It would be nice to get rid of (cd $TEST_SRCDIR) in the test-setup script.
     * test timeouts.
     * parsing XML output.
-
     */
-  protected final PathFragment runfilesPrefix;
 
   public StandaloneTestStrategy(OptionsClassProvider requestOptions,
-      OptionsClassProvider startupOptions, BinTools binTools, PathFragment runfilesPrefix) {
+      OptionsClassProvider startupOptions, BinTools binTools) {
     super(requestOptions, startupOptions, binTools);
-
-    this.runfilesPrefix = runfilesPrefix;
   }
 
   private static final String TEST_SETUP = "tools/test/test-setup.sh";
@@ -81,7 +75,7 @@ public class StandaloneTestStrategy extends TestStrategy {
       throw new TestExecException(e.getMessage());
     }
 
-    Path workingDirectory = runfilesDir.getRelative(runfilesPrefix);
+    Path workingDirectory = runfilesDir.getRelative(action.getRunfilesPrefix());
     Map<String, String> env = getEnv(action, runfilesDir);
     Spawn spawn = new BaseSpawn(getArgs(action), env,
         action.getTestProperties().getExecutionInfo(),
@@ -127,13 +121,13 @@ public class StandaloneTestStrategy extends TestStrategy {
 
     vars.putAll(config.getDefaultShellEnvironment());
     vars.putAll(config.getTestEnv());
-    vars.put("TEST_SRCDIR", runfilesDir.getRelative(runfilesPrefix).getPathString());
+    vars.put("TEST_SRCDIR", runfilesDir.getRelative(action.getRunfilesPrefix()).getPathString());
 
     // TODO(bazel-team): set TEST_TMPDIR.
 
     return vars;
   }
-  
+
   private TestResultData execute(
       ActionExecutionContext actionExecutionContext, Spawn spawn, TestRunnerAction action)
       throws TestExecException, InterruptedException {
@@ -198,7 +192,7 @@ public class StandaloneTestStrategy extends TestStrategy {
       } else {
         if (result.getData().getStatus() == BlazeTestStatus.TIMEOUT) {
           executor.getEventHandler().handle(
-              new Event(EventKind.TIMEOUT, null, result.getTestName() 
+              new Event(EventKind.TIMEOUT, null, result.getTestName()
                   + " (see " + testOutput + ")"));
         } else {
           executor.getEventHandler().handle(
@@ -207,13 +201,13 @@ public class StandaloneTestStrategy extends TestStrategy {
       }
     }
   }
-  
-  private final void finalizeTest(ActionExecutionContext actionExecutionContext, 
+
+  private final void finalizeTest(ActionExecutionContext actionExecutionContext,
       TestRunnerAction action, TestResultData data) throws IOException, ExecException {
     TestResult result = new TestResult(action, data, false);
     postTestResult(actionExecutionContext.getExecutor(), result);
 
-    processTestOutput(actionExecutionContext.getExecutor(), 
+    processTestOutput(actionExecutionContext.getExecutor(),
         actionExecutionContext.getFileOutErr(), result);
     // TODO(bazel-team): handle --test_output=errors, --test_output=all.
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java
index 2ac9a0fc5f..2b3b698828 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java
@@ -256,7 +256,7 @@ public final class TestActionBuilder {
             testLog, cacheStatus,
             coverageArtifact, microCoverageArtifact,
             testProperties, executionSettings,
-            shard, run, config));
+            shard, run, config, ruleContext.getWorkspaceName()));
         results.add(cacheStatus);
       }
     }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
index 28500a752c..52fa09cc27 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
@@ -79,6 +79,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
   private final TestTargetExecutionSettings executionSettings;
   private final int shardNum;
   private final int runNumber;
+  private final String workspaceName;
 
   // Mutable state related to test caching.
   private boolean checkedCaching = false;
@@ -112,7 +113,8 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
       TestTargetExecutionSettings executionSettings,
       int shardNum,
       int runNumber,
-      BuildConfiguration configuration) {
+      BuildConfiguration configuration,
+      String workspaceName) {
     super(owner, inputs, list(testLog, cacheStatus, coverageArtifact, microCoverageArtifact));
     this.configuration = Preconditions.checkNotNull(configuration);
     this.testLog = testLog;
@@ -147,6 +149,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
     this.undeclaredOutputsManifestPath = undeclaredOutputsAnnotationsDir.getChild("MANIFEST");
     this.undeclaredOutputsAnnotationsPath = undeclaredOutputsAnnotationsDir.getChild("ANNOTATIONS");
     this.testInfrastructureFailure = baseDir.getChild(namePrefix + ".infrastructure_failure");
+    this.workspaceName = workspaceName;
   }
 
   public BuildConfiguration getConfiguration() {
@@ -165,7 +168,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
   public boolean showsOutputUnconditionally() {
     return true;
   }
-  
+
   @Override
   public int getInputCount() {
     return Iterables.size(getInputs());
@@ -484,6 +487,13 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
     return runNumber;
   }
 
+  /**
+   * @return the workspace name.
+   */
+  public String getRunfilesPrefix() {
+    return workspaceName;
+  }
+
   @Override
   public Artifact getPrimaryOutput() {
     return testLog;