diff options
| author |  hlopko <hlopko@google.com> | 2018-04-20 02:09:36 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-20 02:11:08 -0700 |
| commit | dc4a3278739023cb39c66b9b017fe84d60094734 (patch) | |
| tree | 5ad52d9bc7f6b1132cb4c3618931b7a3ae390dc5 /src/test/java | |
| parent | eafd4d4a088cde1f4a3b36412a763ce19abe672d (diff) | |
Extract CcCommon.configureFeaturesOrThrowEvalException
This method will be available to Skylark. Native rules will use the wrapped
version in CcCommon.configureFeaturesOrReportRuleError. The error message shown
in case of conflicting features was modified slightly.
RELNOTES: None.
PiperOrigin-RevId: 193639182
Diffstat (limited to 'src/test/java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java index 9e6cbc3a90..ffe4ca9777 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java @@ -872,7 +872,7 @@ public class CcToolchainTest extends BuildViewTestCase { CcToolchainProvider toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER); FeatureConfiguration featureConfiguration = - CcCommon.configureFeatures(getRuleContext(target), toolchainProvider); + CcCommon.configureFeaturesOrReportRuleError(getRuleContext(target), toolchainProvider); assertThat(toolchainProvider.supportsEmbeddedRuntimes()) .isEqualTo(featureConfiguration.isEnabled(CppRuleClasses.STATIC_LINK_CPP_RUNTIMES)); } @@ -886,7 +886,7 @@ public class CcToolchainTest extends BuildViewTestCase { CcToolchainProvider toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER); FeatureConfiguration featureConfiguration = - CcCommon.configureFeatures(getRuleContext(target), toolchainProvider); + CcCommon.configureFeaturesOrReportRuleError(getRuleContext(target), toolchainProvider); assertThat(toolchainProvider.supportsEmbeddedRuntimes()) .isEqualTo(featureConfiguration.isEnabled(CppRuleClasses.STATIC_LINK_CPP_RUNTIMES)); } |