diff options
| author |  cpeyser <cpeyser@google.com> | 2017-11-13 08:03:34 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-13 08:04:58 -0800 |
| commit | 9fdedde450245757d2f6521450ffaf3a51fc4bcf (patch) | |
| tree | fedffd81e734730cfd7249e0369c75d827b0bcb7 /src/test/java/com/google/devtools/build/lib | |
| parent | 4eb87c196279ae4745428db260dde2155c7433e2 (diff) | |
toolchain_type can export make variables from the toolchain instead of the
configuration.
PiperOrigin-RevId: 175532550
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java | 18 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java index 9b6cc4995c..e3e4fbad15 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.TemplateVariableInfo; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.packages.util.MockPlatformSupport; import com.google.devtools.build.lib.testutil.TestConstants; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,4 +42,21 @@ public class ToolchainTypeTest extends BuildViewTestCase { getConfiguredTarget(TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type"); assertThat(cc.get(TemplateVariableInfo.PROVIDER).getVariables()).doesNotContainKey("JAVABASE"); } + + @Test + public void testMakeVariablesFromToolchain() throws Exception { + MockPlatformSupport.addMockPiiiPlatform( + mockToolsConfig, analysisMock.ccSupport().getMockCrosstoolLabel()); + useConfiguration( + "--enabled_toolchain_types=" + + TestConstants.TOOLS_REPOSITORY + + "//tools/cpp:toolchain_type", + "--experimental_platforms=//mock_platform:mock-piii-platform", + "--extra_toolchains=//mock_platform:toolchain_cc-compiler-piii", + "--make_variables_source=toolchain"); + ConfiguredTarget cc = + getConfiguredTarget(TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type"); + assertThat(cc.get(TemplateVariableInfo.PROVIDER).getVariables()) + .containsEntry("TARGET_CPU", "piii"); + } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java index 87eb6837e3..a899f05b75 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java @@ -40,6 +40,7 @@ public class CcToolchainProviderTest { null, null, null, + null, NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), @@ -73,6 +74,7 @@ public class CcToolchainProviderTest { null, null, null, + null, NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), |