Use a relative path for the runfiles tree

Add preconditions to enforce this and remove some now unnecessary code. A small step towards bazelbuild#1593. -- PiperOrigin-RevId: 150625693 MOS_MIGRATED_REVID=150625693
sigaev · Mar 21, 2017 · edd531d · edd531d
1 parent 4475bf1
commit edd531d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java
@@ -65,6 +65,7 @@ public RunfilesSupplierImpl(
       PathFragment runfilesDir,
       Runfiles runfiles,
       @Nullable Artifact manifest) {
+    Preconditions.checkArgument(!runfilesDir.isAbsolute());
     this.runfilesDir = Preconditions.checkNotNull(runfilesDir);
     this.runfiles = Preconditions.checkNotNull(runfiles);
     this.manifest = manifest;

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
@@ -118,7 +118,7 @@ public void exec(TestRunnerAction action, ActionExecutionContext actionExecution
             ImmutableMap.copyOf(env),
             ImmutableMap.copyOf(info),
             new RunfilesSupplierImpl(
-                runfilesDir.asFragment(), action.getExecutionSettings().getRunfiles()),
+                runfilesDir.relativeTo(execRoot), action.getExecutionSettings().getRunfiles()),
             /*inputs=*/ImmutableList.copyOf(action.getInputs()),
             /*tools=*/ImmutableList.<Artifact>of(),
             /*filesetManifests=*/ImmutableList.<Artifact>of(),

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SpawnHelpers.java b/src/main/java/com/google/devtools/build/lib/sandbox/SpawnHelpers.java
@@ -145,9 +145,7 @@ void mountRunfilesFromSuppliers(Map<PathFragment, Path> mounts, Spawn spawn) thr
     for (Map.Entry<PathFragment, Map<PathFragment, Artifact>> rootAndMappings :
         rootsAndMappings.entrySet()) {
       PathFragment root = rootAndMappings.getKey();
-      if (root.isAbsolute()) {
-        root = root.relativeTo(execRoot.asFragment());
-      }
+      Preconditions.checkState(!root.isAbsolute());
       for (Map.Entry<PathFragment, Artifact> mapping : rootAndMappings.getValue().entrySet()) {
         Artifact sourceArtifact = mapping.getValue();
         Path source =

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java
@@ -353,7 +353,7 @@ public void testInputManifestsRemovedIfSupplied() throws Exception {
     Action[] actions = builder()
         .addInput(manifest)
         .addRunfilesSupplier(
-            new RunfilesSupplierImpl(new PathFragment("/destination/"), Runfiles.EMPTY, manifest))
+            new RunfilesSupplierImpl(new PathFragment("destination"), Runfiles.EMPTY, manifest))
         .addOutput(getBinArtifactWithNoOwner("output"))
         .setExecutable(scratch.file("/bin/xxx").asFragment())
         .setProgressMessage("Test")