diff options
| author |  cpeyser <cpeyser@google.com> | 2017-09-07 22:16:06 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-08 09:47:26 +0200 |
| commit | d852e484d8114829ad2d7a98f075a823889f5469 (patch) | |
| tree | 7cc5fa6eb7d2853e2ce6e1a523a380b7eeb2a7ab /src/test/java/com/google/devtools/build/lib/testutil/TestRuleClassProvider.java | |
| parent | f7fc22e6fd665e73fe98846efa36a60e4bad05fe (diff) | |
Add a new toolchain type for c++. In order to do this, PlatformConfiguration is made a legal configuration fragment for every rule class.
Add a default "dummy" c++ toolchain to prevent resolution errors when legacy toolchain selection logic is used. Add toolchain mocks to java and shell tests.
PiperOrigin-RevId: 167901210
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/testutil/TestRuleClassProvider.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/testutil/TestRuleClassProvider.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestRuleClassProvider.java b/src/test/java/com/google/devtools/build/lib/testutil/TestRuleClassProvider.java index e69cb7ec0a..9391aa7b4a 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/TestRuleClassProvider.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/TestRuleClassProvider.java @@ -27,7 +27,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.MakeVariableInfo; import com.google.devtools.build.lib.analysis.PlatformConfiguration; -import com.google.devtools.build.lib.analysis.PlatformSemantics; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.analysis.RuleContext; @@ -151,7 +150,7 @@ public class TestRuleClassProvider { public static class MockToolchainRule implements RuleDefinition { @Override public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { - return PlatformSemantics.platformAttributes(builder) + return builder .requiresConfigurationFragments(PlatformConfiguration.class) .addRequiredToolchains( ImmutableList.of(Label.parseAbsoluteUnchecked("//toolchain:test_toolchain"))) |