Pass in the test environment using BuildConfiguration.Options.testEnvironment instead of special-casing it in a large number of classes.

The variables in the client environment are read in BlazeRuntime#beforeCommand() now.

Note that this entails a slight loss of caching: before, "--test_env=a=A,b=B" and "--test_env=b=B,a=A" were equivalent, now they are not, since instead of comparing Map<String, String>, List<Map.Entry<String,String>> instances are compared.

--
MOS_MIGRATED_REVID=91570828

1 files changed, 1 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index 3ce610b223..bec1477c48 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -259,7 +259,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
     BuildRequestOptions requestOptions = optionsParser.getOptions(BuildRequestOptions.class);
     ImmutableSortedSet<String> multiCpu = ImmutableSortedSet.copyOf(requestOptions.multiCpus);
     BuildConfigurationKey configurationKey = new BuildConfigurationKey(
-        buildOptions, directories, ImmutableMap.<String, String>of(), multiCpu);
+        buildOptions, directories, multiCpu);
     masterConfig = skyframeExecutor.createConfigurations(configurationFactory, configurationKey);
     analysisResult = buildView.update(loadingResult, masterConfig, viewOptions,
         AnalysisTestUtil.TOP_LEVEL_ARTIFACT_CONTEXT, reporter, eventBus);