From 64b4af9880ba90d3185fdf993883148205a4992d Mon Sep 17 00:00:00 2001 From: cpeyser Date: Wed, 11 Oct 2017 19:12:31 +0200 Subject: Replace all tool getters in CppConfiguration with corresponding calls to CcToolchainProvider#getToolPathFragment. PiperOrigin-RevId: 171837541 --- .../lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java index 15923bf164..a68b5450f5 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java @@ -32,7 +32,9 @@ import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTa import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.rules.cpp.CppConfiguration; +import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; +import com.google.devtools.build.lib.rules.cpp.CppConfiguration.Tool; +import com.google.devtools.build.lib.rules.cpp.CppHelper; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.List; @@ -317,7 +319,10 @@ public class GenRuleConfiguredTargetTest extends BuildViewTestCase { SpawnAction barAction = (SpawnAction) getGeneratingAction(barOutTarget.getArtifact()); - String cc = "" + targetConfig.getFragment(CppConfiguration.class).getCppExecutable(); + CcToolchainProvider toolchain = + CppHelper.getToolchainUsingDefaultCcToolchainAttribute( + getRuleContext(getConfiguredTarget("//foo:bar"))); + String cc = toolchain.getToolPathFragment(Tool.GCC).getPathString(); String expected = cc + " -o " -- cgit v1.2.3