diff options
| author |  hlopko <hlopko@google.com> | 2017-09-29 07:31:12 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-09-29 12:14:49 -0400 |
| commit | 65959f53f74a8d0b7cba4a2adc7ed2bdfa1ea0ff (patch) | |
| tree | 7ae06cb983431d1c0ffd48bcd0c889219ec2060f /src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | |
| parent | ce1297354cb1175322a024f6d1e9f15f11716895 (diff) | |
Pass CppSemantics down to the CppLinkActionBuilder
Currently CppLinkActionBuilder is not using CppSemantics, but it will when
we use full CppCompileAction for linkstamp compiles. This cl is a preparation
for that.
RELNOTES: None.
PiperOrigin-RevId: 170467826
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 12 |
1 files changed, 8 insertions, 4 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 19f4392273..f3de8b24a6 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 @@ -320,7 +320,8 @@ public class CppLinkActionTest extends BuildViewTestCase { : staticOutputFile, CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext), - featureConfiguration) {}; + featureConfiguration, + MockCppSemantics.INSTANCE) {}; builder.addCompilationInputs( attributesToFlip.contains(NonStaticAttributes.COMPILATION_INPUTS) ? ImmutableList.of(oFile) @@ -381,7 +382,8 @@ public class CppLinkActionTest extends BuildViewTestCase { : dynamicOutputFile, CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext), - featureConfiguration) {}; + featureConfiguration, + MockCppSemantics.INSTANCE) {}; builder.addCompilationInputs( attributes.contains(StaticKeyAttributes.COMPILATION_INPUTS) ? ImmutableList.of(oFile) @@ -413,7 +415,8 @@ public class CppLinkActionTest extends BuildViewTestCase { output, CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext), - FeatureConfiguration.EMPTY); + FeatureConfiguration.EMPTY, + MockCppSemantics.INSTANCE); builder.setLinkType(LinkTargetType.STATIC_LIBRARY); assertThat(builder.canSplitCommandLine()).isTrue(); @@ -506,7 +509,8 @@ public class CppLinkActionTest extends BuildViewTestCase { ruleContext.getConfiguration(), CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext), - featureConfiguration) + featureConfiguration, + MockCppSemantics.INSTANCE) .addObjectFiles(nonLibraryInputs) .addLibraries(NestedSetBuilder.wrap(Order.LINK_ORDER, libraryInputs)) .setLinkType(type) |