Track the test environment in Skyframe, like the action environment

Instead of passing a client env into the test strategies, use the same
mechansim as --action_env, by depending on the right set of Skyframe nodes that
correspond to client env entries.

PiperOrigin-RevId: 158401670

1 files changed, 9 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index cbf98e12ea..6ff3e3bc21 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -91,12 +91,20 @@ public final class ActionsTestUtil {
 
   public static ActionExecutionContext createContext(Executor executor, FileOutErr fileOutErr,
       Path execRoot, MetadataHandler metadataHandler, @Nullable ActionGraph actionGraph) {
+    return createContext(
+        executor, fileOutErr, execRoot, metadataHandler, ImmutableMap.<String, String>of(),
+        actionGraph);
+  }
+
+  public static ActionExecutionContext createContext(Executor executor, FileOutErr fileOutErr,
+      Path execRoot, MetadataHandler metadataHandler, Map<String, String> clientEnv,
+      @Nullable ActionGraph actionGraph) {
     return new ActionExecutionContext(
         executor,
         new SingleBuildFileCache(execRoot.getPathString(), execRoot.getFileSystem()),
         metadataHandler,
         fileOutErr,
-        ImmutableMap.<String, String>of(),
+        ImmutableMap.<String, String>copyOf(clientEnv),
         actionGraph == null
             ? createDummyArtifactExpander()
             : ActionInputHelper.actionGraphArtifactExpander(actionGraph));