From b3cf83cd20f30d77e6768de651a3e652f86d6f78 Mon Sep 17 00:00:00 2001 From: lberki Date: Tue, 13 Mar 2018 06:03:11 -0700 Subject: Make DeployArchiveBuilder fetch the C++ toolchain identifier through CcToolchainProvider instead of BuildConfiguration. This is a step towards removing BuildConfiguration#getPlatformName(). RELNOTES: None. PiperOrigin-RevId: 188862029 --- .../google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules') diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java index 94ff70e6c4..ff807fa369 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java @@ -143,7 +143,7 @@ public class CcToolchainSelectionTest extends BuildViewTestCase { CcToolchainProvider toolchain = (CcToolchainProvider) providers.getForToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE)); - assertThat(toolchain.getToolchain().getTargetCpu()).isEqualTo("piii"); + assertThat(toolchain.getToolchainIdentifier()).endsWith("piii"); } @Test -- cgit v1.2.3