diff options
author | 2017-12-06 06:03:03 -0800 | |
---|---|---|
committer | 2017-12-06 06:06:29 -0800 | |
commit | 21aa1024c5f5302d998457b1538c864c233bf460 (patch) | |
tree | 955e80c7766992fd28bb9d728e8cb88cc1942c9b /src/test/java/com/google/devtools | |
parent | 31320246a1d428c0b56f78b98013961c68ed322d (diff) |
Move BazelRuleClassProvider.CORE_WORKSPACE_RULES to its own class in the rules/repository package.
PiperOrigin-RevId: 178087895
Diffstat (limited to 'src/test/java/com/google/devtools')
4 files changed, 6 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 69bfcc5360..a34ea88256 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -1002,6 +1002,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:core-rules", + "//src/main/java/com/google/devtools/build/lib:core-workspace-rules", "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:java-compilation", "//src/main/java/com/google/devtools/build/lib:packages-internal", 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 21135f8391..39bccbdf18 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 @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.rules.config.ConfigRules; import com.google.devtools.build.lib.rules.core.CoreRules; +import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -88,7 +89,7 @@ public class BazelRuleClassProviderTest { @Test public void coreWorkspaceConsistency() { - checkModule(BazelRuleClassProvider.CORE_WORKSPACE_RULES); + checkModule(CoreWorkspaceRules.INSTANCE); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD index 891afc7ee7..de5276dc7f 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD @@ -20,6 +20,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:core-rules", + "//src/main/java/com/google/devtools/build/lib:core-workspace-rules", "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:util", 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 a8f9848d60..c676f67093 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 @@ -38,6 +38,7 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.rules.ToolchainType; import com.google.devtools.build.lib.rules.core.CoreRules; +import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.util.OsUtils; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -968,7 +969,7 @@ public class CcCommonTest extends BuildViewTestCase { builder.setToolsRepository("@bazel_tools"); BazelRuleClassProvider.BAZEL_SETUP.init(builder); CoreRules.INSTANCE.init(builder); - BazelRuleClassProvider.CORE_WORKSPACE_RULES.init(builder); + CoreWorkspaceRules.INSTANCE.init(builder); BazelRuleClassProvider.PLATFORM_RULES.init(builder); BazelRuleClassProvider.GENERIC_RULES.init(builder); BazelRuleClassProvider.CPP_RULES.init(builder); |