A minor refactoring of BlazeRuntime.

--
MOS_MIGRATED_REVID=91405317

3 files changed, 7 insertions, 19 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 2a0e87df96..91985bb4c2 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -138,6 +138,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -234,7 +235,7 @@ public final class BlazeRuntime {
    */
   private static Map<String, String> computeTestEnv(List<Map.Entry<String, String>> envOverrides,
       Map<String, String> clientEnvironment) {
-    Map<String, String> testEnv = new HashMap<>();
+    Map<String, String> testEnv = new TreeMap<>();
     for (Map.Entry<String, String> var : envOverrides) {
       if (var.getValue() != null) {
         testEnv.put(var.getKey(), var.getValue());
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index 8089f5dc8d..ebe3fa3819 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -106,18 +106,6 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
         hostConfig.getFragment(CppConfiguration.class).getCcToolchainRuleLabel());
   }
 
-  public void testTestEnvironment() throws Exception {
-    clientEnv.put("MY_VAR1", "1");
-    clientEnv.put("MY_VAR2", "1");
-    BuildConfiguration config = create(
-        "--test_env=MY_VAR1", "--test_env=MY_VAR2=2",
-        "--test_env=MY_VAR3=3", "--test_env=NO_SUCH_VAR");
-    assertThat(config.getTestEnv()).containsEntry("MY_VAR1", "1");
-    assertThat(config.getTestEnv()).containsEntry("MY_VAR2", "2");
-    assertThat(config.getTestEnv()).containsEntry("MY_VAR3", "3");
-    assertThat(config.getTestEnv()).doesNotContainKey("NO_SUCH_VAR");
-  }
-
   public void testMakeEnvFlags() throws Exception {
     BuildConfiguration config = create();
     assertThat(config.getMakeEnvironment().get("STRIP")).contains("strip");
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index a761b08ff4..b65837adac 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
@@ -78,7 +77,6 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
   }
 
   protected SkyframeExecutor skyframeExecutor;
-  protected Map<String, String> clientEnv;
   protected ConfigurationFactory configurationFactory;
   protected Path workspace;
   protected ImmutableList<Class<? extends FragmentOptions>> buildOptionClasses;
@@ -87,7 +85,6 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     workspace = rootDirectory;
-    clientEnv = Maps.newHashMap();
 
     ConfiguredRuleClassProvider ruleClassProvider = TestRuleClassProvider.getRuleClassProvider();
     PathPackageLocator pkgLocator = new PathPackageLocator(rootDirectory);
@@ -150,10 +147,12 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
 
     configurationFactory.forbidSanityCheck();
     BuildOptions buildOptions = BuildOptions.of(buildOptionClasses, parser);
-    BuildConfigurationCollection collection =
-        skyframeExecutor.createConfigurations(configurationFactory,
+    BuildConfigurationCollection collection = skyframeExecutor.createConfigurations(
+        configurationFactory,
         new BuildConfigurationKey(buildOptions,
-        new BlazeDirectories(outputBase, outputBase, workspace), clientEnv, multiCpu));
+        new BlazeDirectories(outputBase, outputBase, workspace),
+        ImmutableMap.<String, String>of(),
+        multiCpu));
     return collection;
   }