diff options
| author |  hlopko <hlopko@google.com> | 2017-05-22 11:33:47 +0200 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-05-22 14:40:28 +0200 |
| commit | b36774ac955c5af15d59df36c66dc69f89674a49 (patch) | |
| tree | 4c74e6d5fdc77c511dff5708177bdfe42eeb57c0 /src/test/java/com/google/devtools/build/lib | |
| parent | bbb9bbc84a826345f118b0d94f337165a341af30 (diff) | |
Extract :cc_toolchain as constant
And while at it cleanup all the calls of CppHelper.getToolchain and
CppHelper.getFdoSupport.
RELNOTES: None.
PiperOrigin-RevId: 156716291
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index a5358344ce..254d4e93a5 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -283,8 +283,8 @@ public class CppLinkActionTest extends BuildViewTestCase { attributesToFlip.contains(NonStaticAttributes.OUTPUT_FILE) ? dynamicOutputFile : staticOutputFile, - CppHelper.getToolchain(ruleContext, ":cc_toolchain"), - CppHelper.getFdoSupport(ruleContext, ":cc_toolchain")) {}; + CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), + CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext)) {}; builder.addCompilationInputs( attributesToFlip.contains(NonStaticAttributes.COMPILATION_INPUTS) ? ImmutableList.of(oFile) @@ -344,8 +344,8 @@ public class CppLinkActionTest extends BuildViewTestCase { attributes.contains(StaticKeyAttributes.OUTPUT_FILE) ? staticOutputFile : dynamicOutputFile, - CppHelper.getToolchain(ruleContext, ":cc_toolchain"), - CppHelper.getFdoSupport(ruleContext, ":cc_toolchain")) {}; + CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), + CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext)) {}; builder.addCompilationInputs( attributes.contains(StaticKeyAttributes.COMPILATION_INPUTS) ? ImmutableList.of(oFile) @@ -376,8 +376,8 @@ public class CppLinkActionTest extends BuildViewTestCase { new CppLinkActionBuilder( ruleContext, output, - CppHelper.getToolchain(ruleContext, ":cc_toolchain"), - CppHelper.getFdoSupport(ruleContext, ":cc_toolchain")); + CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), + CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext)); builder.setLinkType(LinkTargetType.STATIC_LIBRARY); assertTrue(builder.canSplitCommandLine()); @@ -465,8 +465,8 @@ public class CppLinkActionTest extends BuildViewTestCase { getTargetConfiguration() .getBinDirectory(ruleContext.getRule().getRepository())), ruleContext.getConfiguration(), - CppHelper.getToolchain(ruleContext, ":cc_toolchain"), - CppHelper.getFdoSupport(ruleContext, ":cc_toolchain")) + CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), + CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext)) .addObjectFiles(nonLibraryInputs) .addLibraries(NestedSetBuilder.wrap(Order.LINK_ORDER, libraryInputs)) .setLinkType(type) |