Split up rule sets into smaller chunks.

Move the Bazel-specific setup into a separate RuleSet and don't explicitly
depend on that - instead, implicitly call it's init() whenever we need a
valid RCP.

--
MOS_MIGRATED_REVID=136444074

2 files changed, 17 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java
index ee075d63a7..9b5345a3d8 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java
@@ -61,6 +61,7 @@ public class BazelRuleClassProviderTest {
     ConfiguredRuleClassProvider.Builder builder = new ConfiguredRuleClassProvider.Builder();
     builder.setToolsRepository(BazelRuleClassProvider.TOOLS_REPOSITORY);
     Set<RuleModule> result = new HashSet<>();
+    result.add(BazelRuleClassProvider.BAZEL_SETUP);
     collectTransitiveClosure(result, top);
     for (RuleModule module : result) {
       module.init(builder);
@@ -79,8 +80,18 @@ public class BazelRuleClassProviderTest {
   }
 
   @Test
-  public void minimalConsistency() {
-    checkModule(BazelRuleClassProvider.MINIMAL_RULES);
+  public void coreConsistency() {
+    checkModule(BazelRuleClassProvider.CORE_RULES);
+  }
+
+  @Test
+  public void coreWorkspaceConsistency() {
+    checkModule(BazelRuleClassProvider.CORE_WORKSPACE_RULES);
+  }
+
+  @Test
+  public void basicConsistency() {
+    checkModule(BazelRuleClassProvider.BASIC_RULES);
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index cf6de2c6c1..cf29915a7d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -830,7 +830,10 @@ public class CcCommonTest extends BuildViewTestCase {
         public ConfiguredRuleClassProvider createRuleClassProvider() {
           ConfiguredRuleClassProvider.Builder builder = new ConfiguredRuleClassProvider.Builder();
           builder.setToolsRepository("@bazel_tools");
-          BazelRuleClassProvider.MINIMAL_RULES.init(builder);
+          BazelRuleClassProvider.BAZEL_SETUP.init(builder);
+          BazelRuleClassProvider.CORE_RULES.init(builder);
+          BazelRuleClassProvider.CORE_WORKSPACE_RULES.init(builder);
+          BazelRuleClassProvider.BASIC_RULES.init(builder);
           BazelRuleClassProvider.CPP_RULES.init(builder);
           return builder.build();
         }