diff options
| author |  dbabkin <dbabkin@google.com> | 2018-07-31 05:55:29 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-31 05:57:23 -0700 |
| commit | a7bd13345bf22096298592b72fb1752c3c755278 (patch) | |
| tree | bf2f8f9c075b3dd541e887b241b7aff10e691c27 /src/test/java/com/google/devtools/build/lib/rules | |
| parent | fab7203fdba85a3791cc8d3ba1f106adbb9b4ad9 (diff) | |
Clearing //tools/defaults:*
Replaced reference to //tools/defaults:crosstool by //tools/cpp:crosstool.
Added Target //tools/cpp:crosstool to base test environment setup.
RELNOTES:none
PiperOrigin-RevId: 206747334
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java index 95bfdc7ead..4e1247fefb 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.collect.nestedset.NestedSet; +import com.google.devtools.build.lib.testutil.TestConstants; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -232,13 +233,17 @@ public class CcToolchainSuiteTest extends BuildViewTestCase { " name = 'linux-files',", " srcs = ['linux-marker', 'everything'])"); - scratch.file("a/BUILD", - "genrule(name='a', srcs=[], outs=['ao'], tools=['//tools/defaults:crosstool'], cmd='x')"); + scratch.file( + "a/BUILD", + "genrule(name='a', srcs=[], outs=['ao'],", + " tools=['" + TestConstants.TOOLS_REPOSITORY + "//tools/cpp:crosstool'],", + " cmd='x'", + ")"); invalidatePackages(); - useConfiguration("--crosstool_top=//cc:suite", "--cpu=k8"); + useConfiguration( + "--crosstool_top=//cc:suite", "--cpu=ppc", "--host_cpu=ppc", "--compiler=compiler"); Action action = getGeneratingAction(getConfiguredTarget("//a:a"), "a/ao"); - assertThat(ActionsTestUtil.baseArtifactNames(action.getInputs())) - .containsAllOf("k8-marker", "darwin-marker", "windows-marker", "linux-marker"); + assertThat(ActionsTestUtil.baseArtifactNames(action.getInputs())).contains("linux-marker"); NestedSet<Artifact> suiteFiles = getFilesToBuild(getConfiguredTarget("//cc:suite")); assertThat(ActionsTestUtil.baseArtifactNames(suiteFiles)) |