diff options
author | Klaus Aehlig <aehlig@google.com> | 2016-08-26 15:58:48 +0000 |
---|---|---|
committer | John Cater <jcater@google.com> | 2016-08-26 18:42:28 +0000 |
commit | 4c10f3f86f7a0530e83d4b2062b48676afafe2c0 (patch) | |
tree | cf4e6010fe9e1551a177b2c4dbb7c2276a1cfec3 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 6488b3bc824a0f19ad2924d5f7c87181f06beed9 (diff) |
Make SpawnActions honor the client environment
...for the variables that supposed to be inherited from it. Note
That with this patch, we take the correct variables, but do not
yet track the dependency on changes to the client environment; this
will happen in a follow up patches.
Also add a test that demonstrates that the client environment rather
than that at startup is taken.
--
Change-Id: I4d33efa8eaf4f8b689c9b7f2130f71309f3343f0
Reviewed-on: https://bazel-review.googlesource.com/#/c/5392
MOS_MIGRATED_REVID=131406356
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java index 937e1ae3cf..d80c5812e4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java @@ -218,8 +218,8 @@ public final class ExtraAction extends SpawnAction { */ // TODO(bazel-team): Add more tests that execute this code path! @Override - public Spawn getSpawn() { - final Spawn base = super.getSpawn(); + public Spawn getSpawn(Map<String, String> clientEnv) { + final Spawn base = super.getSpawn(clientEnv); return new DelegateSpawn(base) { @Override public ImmutableMap<PathFragment, Artifact> getRunfilesManifests() { ImmutableMap.Builder<PathFragment, Artifact> builder = ImmutableMap.builder(); |