diff options
| author |  tomlu <tomlu@google.com> | 2018-01-11 15:17:28 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-11 15:19:05 -0800 |
| commit | 1a19b62bc493d83734c34c888401d5c45e8bf55c (patch) | |
| tree | d71e057a8193a845b2268e8937aa406caa395e09 /src/test/java/com/google/devtools/build/lib/remote | |
| parent | ac2666018e6a4ad37cd108ea86715d8a4904bb01 (diff) | |
Plumb exec root through to all spawn runners.
They need this to parse input manifests. Previously we would grab the exec root from the Root, but wish to unsupport this.
PiperOrigin-RevId: 181669143
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/remote')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java index a19485005b..c278581c2c 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java @@ -168,7 +168,7 @@ public class GrpcRemoteExecutionClientTest { @Override public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException { - return new SpawnInputExpander(/*strict*/ false) + return new SpawnInputExpander(execRoot, /*strict*/ false) .getInputMapping(simpleSpawn, SIMPLE_ARTIFACT_EXPANDER, fakeFileCache, "workspace"); } diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java index b14fb71d16..3e8bb83f4b 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java @@ -138,7 +138,7 @@ public class RemoteSpawnCacheTest { @Override public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException { - return new SpawnInputExpander(/*strict*/ false) + return new SpawnInputExpander(execRoot, /*strict*/ false) .getInputMapping(simpleSpawn, SIMPLE_ARTIFACT_EXPANDER, fakeFileCache, "workspace"); } diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java index c2973b0ae6..bd6c12eda1 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java @@ -758,7 +758,7 @@ public class RemoteSpawnRunnerTest { @Override public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException { - return new SpawnInputExpander(/*strict*/ false) + return new SpawnInputExpander(execRoot, /*strict*/ false) .getInputMapping(spawn, artifactExpander, fakeFileCache, "workspace"); } |