Weave an ArtifactPathREsolver through Runfiles to use when reading pruning manifests.
PiperOrigin-RevId: 211660857
diff --git a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
index 99ed136..581dfc6 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
@@ -30,6 +30,7 @@
import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType;
import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
import com.google.devtools.build.lib.actions.ArtifactOwner;
+import com.google.devtools.build.lib.actions.ArtifactPathResolver;
import com.google.devtools.build.lib.actions.ArtifactRoot;
import com.google.devtools.build.lib.actions.EmptyRunfilesSupplier;
import com.google.devtools.build.lib.actions.FileArtifactValue;
@@ -88,7 +89,8 @@
public void testEmptyRunfiles() throws Exception {
RunfilesSupplier supplier = EmptyRunfilesSupplier.INSTANCE;
FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).isEmpty();
}
@@ -103,7 +105,8 @@
FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
mockCache.put(artifact, FileArtifactValue.createNormalFile(FAKE_DIGEST, 0));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).hasSize(1);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/dir/file"), artifact);
@@ -121,7 +124,8 @@
mockCache.put(artifact, FileArtifactValue.createDirectory(-1));
try {
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
+ ArtifactPathResolver.IDENTITY, true);
fail();
} catch (IOException expected) {
assertThat(expected).hasMessageThat().isEqualTo("Not a file: dir/file");
@@ -140,7 +144,8 @@
mockCache.put(artifact, FileArtifactValue.createDirectory(-1));
expander = new SpawnInputExpander(execRoot, /*strict=*/ false);
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).hasSize(1);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/dir/file"), artifact);
@@ -163,7 +168,8 @@
mockCache.put(artifact1, FileArtifactValue.createNormalFile(FAKE_DIGEST, 1));
mockCache.put(artifact2, FileArtifactValue.createNormalFile(FAKE_DIGEST, 2));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/dir/file"), artifact1);
@@ -185,7 +191,8 @@
FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
mockCache.put(artifact, FileArtifactValue.createNormalFile(FAKE_DIGEST, 1));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).hasSize(1);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/symlink"), artifact);
@@ -205,7 +212,8 @@
FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
mockCache.put(artifact, FileArtifactValue.createNormalFile(FAKE_DIGEST, 1));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings).containsEntry(PathFragment.create("runfiles/symlink"), artifact);
// If there's no other entry, Runfiles adds an empty file in the workspace to make sure the
@@ -236,7 +244,8 @@
fakeCache.put(file1, FileArtifactValue.create(file1));
fakeCache.put(file2, FileArtifactValue.create(file2));
- expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/treeArtifact/file1"), file1);
@@ -268,7 +277,8 @@
fakeCache.put(file1, FileArtifactValue.create(file1));
fakeCache.put(file2, FileArtifactValue.create(file2));
- expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander,
+ ArtifactPathResolver.IDENTITY, true);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/symlink/file1"), file1);
@@ -296,7 +306,8 @@
fakeCache.put(file2, FileArtifactValue.create(file2));
Spawn spawn = new SpawnBuilder("/bin/echo", "Hello World").withInput(treeArtifact).build();
- inputMappings = expander.getInputMapping(spawn, artifactExpander, fakeCache, true);
+ inputMappings = expander.getInputMapping(spawn, artifactExpander, ArtifactPathResolver.IDENTITY,
+ fakeCache, true);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings).containsEntry(PathFragment.create("treeArtifact/file1"), file1);
assertThat(inputMappings).containsEntry(PathFragment.create("treeArtifact/file2"), file2);
