A minor refactoring of BlazeRuntime.

--
MOS_MIGRATED_REVID=91405317

1 files changed, 5 insertions, 6 deletions

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;
   }