2 files changed, 28 insertions, 35 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
index 10ad309133..edba22433d 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
@@ -290,39 +290,32 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
     assertThat(toolDep.getConfiguration().isHostConfiguration()).isTrue();
   }
 
-  /** Runs the same test with untrimmed dynamic configurations. */
-  @TestSpec(size = Suite.SMALL_TESTS)
-  @RunWith(JUnit4.class)
-  public static class WithDynamicConfigurationsNoTrim extends ConfigurationsForTargetsTest {
-    @Override
-    protected FlagBuilder defaultFlags() {
-      return super.defaultFlags().with(Flag.DYNAMIC_CONFIGURATIONS_NOTRIM);
-    }
-
+  @Test
+  public void splitDeps() throws Exception {
     // This test does not pass with trimming because android_binary applies an aspect and aspects
     // are not yet correctly supported with trimming.
-    @Test
-    public void splitDeps() throws Exception {
-      scratch.file(
-          "java/a/BUILD",
-          "cc_library(name = 'lib', srcs = ['lib.cc'])",
-          "android_binary(name='a', manifest = 'AndroidManifest.xml', deps = [':lib'])");
-      useConfiguration("--fat_apk_cpu=k8,armeabi-v7a");
-      List<ConfiguredTarget> deps = getConfiguredDeps("//java/a:a", "deps");
-      assertThat(deps).hasSize(2);
-      ConfiguredTarget dep1 = deps.get(0);
-      ConfiguredTarget dep2 = deps.get(1);
-      assertThat(
-          ImmutableList.<String>of(
-              dep1.getConfiguration().getCpu(),
-              dep2.getConfiguration().getCpu()))
-          .containsExactly("armeabi-v7a", "k8");
-      // We don't care what order split deps are listed, but it must be deterministic.
-      assertThat(
-          ConfiguredTargetFunction.DYNAMIC_SPLIT_DEP_ORDERING.compare(
-              Dependency.withConfiguration(dep1.getLabel(), dep1.getConfiguration()),
-              Dependency.withConfiguration(dep2.getLabel(), dep2.getConfiguration())))
-          .isLessThan(0);
+    if (defaultFlags().contains(Flag.TRIMMED_CONFIGURATIONS)) {
+      return;
     }
+    scratch.file(
+        "java/a/BUILD",
+        "cc_library(name = 'lib', srcs = ['lib.cc'])",
+        "android_binary(name='a', manifest = 'AndroidManifest.xml', deps = [':lib'])");
+    useConfiguration("--fat_apk_cpu=k8,armeabi-v7a");
+    List<ConfiguredTarget> deps = getConfiguredDeps("//java/a:a", "deps");
+    assertThat(deps).hasSize(2);
+    ConfiguredTarget dep1 = deps.get(0);
+    ConfiguredTarget dep2 = deps.get(1);
+    assertThat(
+        ImmutableList.<String>of(
+            dep1.getConfiguration().getCpu(),
+            dep2.getConfiguration().getCpu()))
+        .containsExactly("armeabi-v7a", "k8");
+    // We don't care what order split deps are listed, but it must be deterministic.
+    assertThat(
+        ConfiguredTargetFunction.DYNAMIC_SPLIT_DEP_ORDERING.compare(
+            Dependency.withConfiguration(dep1.getLabel(), dep1.getConfiguration()),
+            Dependency.withConfiguration(dep2.getLabel(), dep2.getConfiguration())))
+        .isLessThan(0);
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithDynamicConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
index 54d8e55d02..d398c10427 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithDynamicConfigurationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
@@ -52,10 +52,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Runs an expanded set of ConfigurationsForTargetsTest with trimmed dynamic configurations. */
+/** Runs an expanded set of ConfigurationsForTargetsTest with trimmed configurations. */
 @TestSpec(size = Suite.SMALL_TESTS)
 @RunWith(JUnit4.class)
-public class ConfigurationsForTargetsWithDynamicConfigurationsTest
+public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
     extends ConfigurationsForTargetsTest {
 
   private ConfigurationResolver configResolver;
@@ -67,7 +67,7 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
 
   @Override
   protected FlagBuilder defaultFlags() {
-    return super.defaultFlags().with(Flag.DYNAMIC_CONFIGURATIONS);
+    return super.defaultFlags().with(Flag.TRIMMED_CONFIGURATIONS);
   }
 
   private static class EmptySplitTransition implements SplitTransition<BuildOptions> {
@@ -430,7 +430,7 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
     ConfiguredTarget target = getView().getConfiguredTargetForTesting(
         reporter,
         Label.parseAbsoluteUnchecked("@//a:factory"),
-        getTargetConfiguration(true));
+        getTargetConfiguration());
     assertThat(target.getConfiguration().getFragment(TestConfiguration.class).getTestFilter())
         .isEqualTo("SET ON COMMAND LINE: original and best");
   }