diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-04-20 10:48:55 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-04-20 16:40:51 +0000 |
| commit | a4dea59f91bbfbb30d1d281f8c05bf6113ee9c01 (patch) | |
| tree | fa1bf3f084a13d8819c4119f25607ced0c0aab8c /src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java | |
| parent | a0a79689260be76002a3058fb461e57a96e26f47 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java index 5c9a337694..18abc269f5 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java @@ -93,9 +93,6 @@ public class PrecomputedValue implements SkyValue { static final Precomputed<Map<BuildInfoKey, BuildInfoFactory>> BUILD_INFO_FACTORIES = new Precomputed<>(new SkyKey(SkyFunctions.PRECOMPUTED, "build_info_factories")); - static final Precomputed<Map<String, String>> TEST_ENVIRONMENT_VARIABLES = - new Precomputed<>(new SkyKey(SkyFunctions.PRECOMPUTED, "test_environment")); - static final Precomputed<BlazeDirectories> BLAZE_DIRECTORIES = new Precomputed<>(new SkyKey(SkyFunctions.PRECOMPUTED, "blaze_directories")); |