Remove --noincompatible_disable_crosstool_file from unit tests

RELNOTES: None.
PiperOrigin-RevId: 243795392

src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java

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 debf195..a5d5c07 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 com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter;
+import com.google.devtools.build.lib.packages.util.MockCcSupport;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.testutil.TestConstants;
 import org.junit.Test;
@@ -32,6 +33,7 @@
   public void testCcTargetsDependOnCcToolchainAutomatically() throws Exception {
     scratch.file(
         "a/BUILD",
+        "load(':cc_toolchain_config.bzl', 'cc_toolchain_config')",
         "filegroup(",
         "   name='empty')",
         "package(default_visibility=['//visibility:public'])",
@@ -51,16 +53,9 @@
         "    linker_files = ':empty',",
         "    strip_files = ':empty',",
         "    objcopy_files = ':empty',",
-        "    proto='''",
-        "      toolchain_identifier: 'banana'",
-        "      abi_version: 'banana'",
-        "      abi_libc_version: 'banana'",
-        "      compiler: 'banana'",
-        "      host_system_name: 'banana'",
-        "      target_system_name: 'banana'",
-        "      target_cpu: 'banana'",
-        "      target_libc: 'banana'",
-        "    ''')",
+        "    toolchain_config = ':toolchain_config',",
+        ")",
+        "cc_toolchain_config(name = 'toolchain_config')",
         "toolchain(",
         "   name = 'toolchain_b',",
         "   toolchain_type = '" + TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type',",
@@ -68,11 +63,11 @@
         "   target_compatible_with = [':mock_value'],",
         ")");
 
+    scratch.file("a/cc_toolchain_config.bzl", MockCcSupport.EMPTY_CC_TOOLCHAIN);
     useConfiguration(
         "--incompatible_enable_cc_toolchain_resolution",
         "--experimental_platforms=//a:mock-platform",
-        "--extra_toolchains=//a:toolchain_b",
-        "--noincompatible_disable_crosstool_file");
+        "--extra_toolchains=//a:toolchain_b");
 
     // for cc_library, cc_binary, and cc_test, we check that $(TARGET_CPU) is a valid Make variable
     ConfiguredTarget cclibrary =
@@ -82,7 +77,7 @@
             .write();
     CppCompileAction compileAction =
         (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cclib/a.o", cclibrary));
-    assertThat(compileAction.getArguments()).contains("foobar-banana");
+    assertThat(compileAction.getArguments()).contains("foobar-mock-abi-version-for-k8");
 
     ConfiguredTarget ccbinary =
         ScratchAttributeWriter.fromLabelString(this, "cc_binary", "//ccbin")
@@ -91,7 +86,7 @@
             .write();
     compileAction =
         (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/ccbin/a.o", ccbinary));
-    assertThat(compileAction.getArguments()).contains("foobar-banana");
+    assertThat(compileAction.getArguments()).contains("foobar-mock-abi-version-for-k8");
 
     ConfiguredTarget cctest =
         ScratchAttributeWriter.fromLabelString(this, "cc_test", "//cctest")
@@ -100,6 +95,6 @@
             .write();
     compileAction =
         (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cctest/a.o", cctest));
-    assertThat(compileAction.getArguments()).contains("foobar-banana");
+    assertThat(compileAction.getArguments()).contains("foobar-mock-abi-version-for-k8");
   }
 }

src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java

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 469fa21..b429081 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
@@ -14,10 +14,7 @@
 
 package com.google.devtools.build.lib.rules.cpp;
 
-import static com.google.common.truth.Truth.assertThat;
 
-import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,70 +27,6 @@
 public class CcToolchainSuiteTest extends BuildViewTestCase {
 
   @Test
-  public void testCcToolchainFromToolchainIdentifierOverridesCpuCompiler() throws Exception {
-    scratch.file(
-        "cc/BUILD",
-        "filegroup(name='empty')",
-        "filegroup(name='everything')",
-        "cc_toolchain(",
-        "    name = 'cc-compiler-fruitie',",
-        "    toolchain_identifier = 'toolchain-identifier-fruitie',",
-        "    all_files = ':empty',",
-        "    ar_files = ':empty',",
-        "    as_files = ':empty',",
-        "    compiler_files = ':empty',",
-        "    dwp_files = ':empty',",
-        "    linker_files = ':empty',",
-        "    strip_files = ':empty',",
-        "    objcopy_files = ':empty',",
-        ")",
-        "cc_toolchain_suite(",
-        "    name = 'suite',",
-        "    toolchains = {",
-        "       'k8': ':cc-compiler-fruitie',",
-        "    },",
-        "    proto = \"\"\"",
-        "major_version: 'v1'",
-        "minor_version: '0'",
-        "toolchain {",
-        "  compiler: 'avocado'",
-        "  target_cpu: 'banana'",
-        "  toolchain_identifier: 'boring-non-fuitie-identifier'",
-        "  host_system_name: 'linux'",
-        "  target_system_name: 'linux'",
-        "  abi_version: 'cpu-abi'",
-        "  abi_libc_version: ''",
-        "  target_libc: 'local'",
-        "  builtin_sysroot: 'sysroot'",
-        "}",
-        "toolchain {",
-        "  compiler: 'orange'",
-        "  target_cpu: 'banana'",
-        "  toolchain_identifier: 'toolchain-identifier-fruitie'",
-        "  host_system_name: 'linux'",
-        "  target_system_name: 'linux'",
-        "  abi_version: 'cpu-abi'",
-        "  abi_libc_version: ''",
-        "  target_libc: 'local'",
-        "  builtin_sysroot: 'sysroot'",
-        "}",
-        "\"\"\"",
-        ")");
-
-    useConfiguration(
-        "--crosstool_top=//cc:suite",
-        "--cpu=k8",
-        "--host_cpu=k8",
-        "--noincompatible_disable_crosstool_file");
-    ConfiguredTarget c =
-        getConfiguredTarget(
-            ruleClassProvider.getToolsRepository() + "//tools/cpp:current_cc_toolchain");
-    CcToolchainProvider ccToolchainProvider = (CcToolchainProvider) c.get(ToolchainInfo.PROVIDER);
-    assertThat(ccToolchainProvider.getToolchainIdentifier())
-        .isEqualTo("toolchain-identifier-fruitie");
-  }
-
-  @Test
   public void testInvalidCpu() throws Exception {
     reporter.removeHandler(failFastHandler);
     useConfiguration("--cpu=bogus");