From 9e8c1657dddb010894fd8cef3a14e7b82aae438c Mon Sep 17 00:00:00 2001 From: Greg Estren Date: Fri, 2 Dec 2016 19:29:33 +0000 Subject: 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 --- .../com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google') 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; } /** -- cgit v1.2.3