Change uses of cc_toolchain_type back to plain toolchain_type.

This is a prequisite to removing cc_toolchain_type entirely.

PiperOrigin-RevId: 198402472

1 files changed, 0 insertions, 60 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 70fe4e0ee5..649eed1bf4 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
@@ -17,15 +17,11 @@ 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.ToolchainContext.ResolvedToolchainProviders;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter;
-import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.util.MockPlatformSupport;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.testutil.TestConstants;
-import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -50,62 +46,6 @@ public class ToolchainTypeTest extends BuildViewTestCase {
   }
 
   @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");
-  }
-
-  @Test
-  public void testGlibcVersionSetInEnv() 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 toolchainType =
-        getConfiguredTarget(TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type");
-    Map<String, String> makeVariables =
-        toolchainType.get(TemplateVariableInfo.PROVIDER).getVariables();
-
-    ConfiguredTarget target =
-        ScratchAttributeWriter.fromLabelString(this, "cc_library", "//lib")
-            .setList("srcs", "a.cc")
-            .write();
-
-    ResolvedToolchainProviders providers =
-        (ResolvedToolchainProviders)
-            getRuleContext(target).getToolchainContext().getResolvedToolchainProviders();
-    CcToolchainProvider toolchainProvider =
-        (CcToolchainProvider)
-            providers.getForToolchainType(
-                Label.parseAbsolute(TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type"));
-
-    String targetLibc = toolchainProvider.getTargetLibc();
-    String glibcVersion = makeVariables.get("GLIBC_VERSION");
-    assertThat(glibcVersion).isNotNull();
-    if (targetLibc.startsWith("glibc-")) {
-      assertThat(glibcVersion).isEqualTo(targetLibc.substring("glibc-".length()));
-    } else {
-      assertThat(glibcVersion).isEqualTo(targetLibc);
-    }
-  }
-
-  @Test
   public void testCcTargetsDependOnCcToolchainAutomatically() throws Exception {
     MockPlatformSupport.addMockPiiiPlatform(
         mockToolsConfig, analysisMock.ccSupport().getMockCrosstoolLabel());