diff options
| author |  cpeyser <cpeyser@google.com> | 2017-08-14 18:07:55 +0200 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-08-16 11:03:44 +0200 |
| commit | 55245e478fcfe8b898e39c7462bc975ba7548325 (patch) | |
| tree | 23872b7eb113e87a561a496846ac2341ac681a45 /src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | |
| parent | c6f85e745b6c342adbb7fc3372b609fcfbded9f6 (diff) | |
Make CcToolchainProvider subclass ToolchainInfo. This is required for use of CcToolchainProvider as a "toolchain" in platform-based toolchain resolution.
PiperOrigin-RevId: 165185303
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index 721045493f..0f0df4484a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.analysis.MakeVariableProvider; import com.google.devtools.build.lib.analysis.config.CompilationMode; import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; +import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; import com.google.devtools.build.lib.analysis.util.AnalysisTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; @@ -161,7 +162,8 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { private CcToolchainProvider getCcToolchainProvider(CppConfiguration cppConfiguration) throws Exception { - return getCcToolchainTarget(cppConfiguration).get(CcToolchainProvider.SKYLARK_CONSTRUCTOR); + return (CcToolchainProvider) + getCcToolchainTarget(cppConfiguration).get(ToolchainInfo.SKYLARK_CONSTRUCTOR); } /** @@ -488,7 +490,8 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { CppConfiguration toolchainA = create(loader, "--cpu=piii", "--host_cpu=piii", "--android_cpu=", "--fat_apk_cpu="); ConfiguredTarget ccToolchainA = getCcToolchainTarget(toolchainA); - CcToolchainProvider ccProviderA = ccToolchainA.get(CcToolchainProvider.SKYLARK_CONSTRUCTOR); + CcToolchainProvider ccProviderA = + (CcToolchainProvider) ccToolchainA.get(ToolchainInfo.SKYLARK_CONSTRUCTOR); MakeVariableProvider makeProviderA = ccToolchainA.get(MakeVariableProvider.SKYLARK_CONSTRUCTOR); assertThat(toolchainA.getToolchainIdentifier()).isEqualTo("toolchain-identifier-A"); assertThat(toolchainA.getHostSystemName()).isEqualTo("host-system-name-A"); |