3 files changed, 15 insertions, 20 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
index 6706dc371b..5fcae537c2 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
@@ -463,8 +463,7 @@ public class BuildViewForTesting {
             /*isSystemEnv=*/ false,
             targetConfig.extendedSanityChecks(),
             eventHandler,
-            /*env=*/ null,
-            targetConfig.isActionsEnabled());
+            /*env=*/ null);
     return getRuleContextForTesting(eventHandler, target, env, configurations);
   }
 
@@ -507,7 +506,6 @@ public class BuildViewForTesting {
             ImmutableList.of(),
             targetConfig,
             configurations.getHostConfiguration(),
-            ruleClassProvider.getLipoDataTransition(),
             ruleClassProvider.getPrerequisiteValidator(),
             ((Rule) target).getRuleClassObject().getConfigurationFragmentPolicy())
         .setVisibility(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index cc16cd4d4f..35ea7ef7ae 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -529,8 +529,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
         /*isSystemEnv=*/ true, /*extendedSanityChecks*/
         false,
         reporter,
-        /* env= */ null,
-        /* allowRegisteringActions= */ true);
+        /* env= */ null);
   }
 
   /**
@@ -1646,11 +1645,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     return Iterables.getOnlyElement(masterConfig.getTargetConfigurations());
   }
 
-  protected BuildConfiguration getDataConfiguration() throws InterruptedException {
-    return getConfiguration(getTargetConfiguration(),
-        getRuleClassProvider().getLipoDataTransition());
-  }
-
   protected BuildConfiguration getHostConfiguration() {
     return masterConfig.getHostConfiguration();
   }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 4899920f02..fb61a6e841 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -209,16 +209,19 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
       BuildConfigurationCollection configCollection) throws Exception {
     Map<ArtifactRoot, BuildConfiguration> outputPaths = new HashMap<>();
     for (BuildConfiguration config : configCollection.getTargetConfigurations()) {
-      if (config.isActionsEnabled()) {
-        BuildConfiguration otherConfig = outputPaths.get(
-            config.getOutputDirectory(RepositoryName.MAIN));
-        if (otherConfig != null) {
-          throw new IllegalStateException("The output path '"
-              + config.getOutputDirectory(RepositoryName.MAIN)
-              + "' is the same for configurations '" + config + "' and '" + otherConfig + "'");
-        } else {
-          outputPaths.put(config.getOutputDirectory(RepositoryName.MAIN), config);
-        }
+      BuildConfiguration otherConfig =
+          outputPaths.get(config.getOutputDirectory(RepositoryName.MAIN));
+      if (otherConfig != null) {
+        throw new IllegalStateException(
+            "The output path '"
+                + config.getOutputDirectory(RepositoryName.MAIN)
+                + "' is the same for configurations '"
+                + config
+                + "' and '"
+                + otherConfig
+                + "'");
+      } else {
+        outputPaths.put(config.getOutputDirectory(RepositoryName.MAIN), config);
       }
     }
   }