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

2 files changed, 15 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index 155ab5d85e..a2b5a882d1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -282,6 +282,11 @@ public final class BazelMockCcSupport extends MockCcSupport {
         "filegroup(",
         "    name = 'link_dynamic_library',",
         "    srcs = ['link_dynamic_library.sh'],",
+        ")",
+        "cc_toolchain_alias(name = 'current_cc_toolchain')",
+        "filegroup(",
+        "    name = 'crosstool',",
+        "    srcs = [':current_cc_toolchain'],",
         ")");
     config.create(
         "/bazel_tools_workspace/tools/cpp/CROSSTOOL",
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))