diff options
| author |  cpeyser <cpeyser@google.com> | 2017-10-11 19:12:31 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-10-12 10:09:06 +0200 |
| commit | 64b4af9880ba90d3185fdf993883148205a4992d (patch) | |
| tree | 1b2fbd0a68008b394bac334ce810c1541b4c8927 /src/test/java | |
| parent | fdb43643b309f2882887e63c108bcc079a18c6d0 (diff) | |
Replace all tool getters in CppConfiguration with corresponding calls to
CcToolchainProvider#getToolPathFragment.
PiperOrigin-RevId: 171837541
Diffstat (limited to 'src/test/java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java | 9 |
1 files changed, 7 insertions, 2 deletions
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 " |