aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools
diff options
context:
space:
mode:
authorGravatar ulfjack <ulfjack@google.com>2018-03-06 00:49:37 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-03-06 00:51:47 -0800
commitd3dd6a1318a4019747f49abf451a35f6a8f2b243 (patch)
treef60613e8fce6346315bdc4039b1d19a1b522de22 /src/test/java/com/google/devtools
parentb5a575afd7534c9d963273c3789bbba80f2994fa (diff)
Also get build-runfiles as an ActionInput for the symlink tree spawn
This isn't strictly necessary since we disable caching and require local execution. PiperOrigin-RevId: 187985476
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r--src/test/java/com/google/devtools/build/lib/exec/SymlinkTreeHelperTest.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/exec/SymlinkTreeHelperTest.java b/src/test/java/com/google/devtools/build/lib/exec/SymlinkTreeHelperTest.java
index 22bb7f8961..808fe36027 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/SymlinkTreeHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/SymlinkTreeHelperTest.java
@@ -42,6 +42,8 @@ public final class SymlinkTreeHelperTest {
Path execRoot = fs.getPath("/my/workspace");
Path inputManifestPath = execRoot.getRelative("input_manifest");
ActionInput inputManifest = ActionInputHelper.fromPath(inputManifestPath.asFragment());
+ BinTools binTools =
+ BinTools.forUnitTesting(execRoot, ImmutableList.of(SymlinkTreeHelper.BUILD_RUNFILES));
Spawn spawn =
new SymlinkTreeHelper(
inputManifestPath,
@@ -50,7 +52,7 @@ public final class SymlinkTreeHelperTest {
.createSpawn(
owner,
execRoot,
- BinTools.forUnitTesting(execRoot, ImmutableList.of(SymlinkTreeHelper.BUILD_RUNFILES)),
+ binTools,
ImmutableMap.of(),
inputManifest);
assertThat(spawn.getResourceOwner()).isSameAs(owner);
@@ -59,7 +61,8 @@ public final class SymlinkTreeHelperTest {
ExecutionRequirements.LOCAL, "",
ExecutionRequirements.NO_CACHE, "",
ExecutionRequirements.NO_SANDBOX, "");
- assertThat(spawn.getInputFiles()).containsExactly(inputManifest);
+ assertThat(spawn.getInputFiles())
+ .containsExactly(inputManifest, binTools.getActionInput(SymlinkTreeHelper.BUILD_RUNFILES));
// At this time, the spawn does not declare any output files.
assertThat(spawn.getOutputFiles()).isEmpty();
}