diff options
| author |  Greg Estren <gregce@google.com> | 2016-12-02 19:29:33 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-12-05 10:19:48 +0000 |
| commit | 9e8c1657dddb010894fd8cef3a14e7b82aae438c (patch) | |
| tree | e6de02eaabccec090fde254ec70ae89a067662a4 /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | |
| parent | 5f95b858e3737fbbc28eed0bb6f67b79a22d4ff1 (diff) | |
Fix bug in configuration creation logic that wrongly trims notrim configs.
Without this, many Bazel tests fail with --experimental_dynamic_configs=notrim_partial.
--
PiperOrigin-RevId: 140873563
MOS_MIGRATED_REVID=140873563
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index e6d0ceb622..7e1a204e32 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -1366,8 +1366,10 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { * targets and their transitive dependencies. */ private static boolean useUntrimmedDynamicConfigs(BuildOptions options) { - return options.get(BuildConfiguration.Options.class).useDynamicConfigurations - == BuildConfiguration.Options.DynamicConfigsMode.NOTRIM; + BuildConfiguration.Options.DynamicConfigsMode mode = + options.get(BuildConfiguration.Options.class).useDynamicConfigurations; + return mode == BuildConfiguration.Options.DynamicConfigsMode.NOTRIM + || mode == BuildConfiguration.Options.DynamicConfigsMode.NOTRIM_PARTIAL; } /** |