diff options
author | hlopko <hlopko@google.com> | 2018-05-07 23:52:02 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-07 23:53:03 -0700 |
commit | 0c5cc1b0253b57c4d04e324fc36536c094a77a6f (patch) | |
tree | 27d38f58f416b1b59247d2c26d8e64c144299870 /src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | |
parent | a590dd10f0a3cdb1c42a6e8d2735cde37b5594bc (diff) |
Rename LinkStaticness to LinkingMode and unify with the other LinkingMode.
RELNOTES: None.
PiperOrigin-RevId: 195777400
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 | 21 |
1 files changed, 10 insertions, 11 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 5d00bf5c12..42673d9fa5 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 @@ -48,7 +48,6 @@ import com.google.devtools.build.lib.packages.util.MockCcSupport; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariableValue; import com.google.devtools.build.lib.rules.cpp.CppActionConfigs.CppPlatform; -import com.google.devtools.build.lib.rules.cpp.Link.LinkStaticness; import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType; import com.google.devtools.build.lib.rules.cpp.Link.LinkerOrArchiver; import com.google.devtools.build.lib.rules.cpp.LinkerInputs.LibraryToLink; @@ -329,7 +328,7 @@ public class CppLinkActionTest extends BuildViewTestCase { } else { builder.setLinkType(LinkTargetType.EXECUTABLE); } - builder.setLinkStaticness(LinkStaticness.DYNAMIC); + builder.setLinkingMode(Link.LinkingMode.DYNAMIC); builder.setNativeDeps(attributesToFlip.contains(NonStaticAttributes.NATIVE_DEPS)); builder.setUseTestOnlyFlags( attributesToFlip.contains(NonStaticAttributes.USE_TEST_ONLY_FLAGS)); @@ -507,10 +506,10 @@ public class CppLinkActionTest extends BuildViewTestCase { .addLibraries(NestedSetBuilder.wrap(Order.LINK_ORDER, libraryInputs)) .setLinkType(type) .setCrosstoolInputs(NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER)) - .setLinkStaticness( + .setLinkingMode( type.linkerOrArchiver() == LinkerOrArchiver.ARCHIVER - ? LinkStaticness.FULLY_STATIC - : LinkStaticness.MOSTLY_STATIC); + ? Link.LinkingMode.LEGACY_FULLY_STATIC + : Link.LinkingMode.STATIC); return builder; } @@ -627,7 +626,7 @@ public class CppLinkActionTest extends BuildViewTestCase { public void testStaticLinkWithDynamicIsError() throws Exception { CppLinkActionBuilder builder = createLinkBuilder(LinkTargetType.STATIC_LIBRARY) - .setLinkStaticness(LinkStaticness.DYNAMIC) + .setLinkingMode(Link.LinkingMode.DYNAMIC) .setLibraryIdentifier("foo"); assertError("static library link must be static", builder); @@ -637,7 +636,7 @@ public class CppLinkActionTest extends BuildViewTestCase { public void testStaticLinkWithSymbolsCountOutputIsError() throws Exception { CppLinkActionBuilder builder = createLinkBuilder(LinkTargetType.STATIC_LIBRARY) - .setLinkStaticness(LinkStaticness.FULLY_STATIC) + .setLinkingMode(Link.LinkingMode.LEGACY_FULLY_STATIC) .setLibraryIdentifier("foo") .setSymbolCountsOutput(scratchArtifact("dummySymbolCounts")); @@ -648,7 +647,7 @@ public class CppLinkActionTest extends BuildViewTestCase { public void testStaticLinkWithNativeDepsIsError() throws Exception { CppLinkActionBuilder builder = createLinkBuilder(LinkTargetType.STATIC_LIBRARY) - .setLinkStaticness(LinkStaticness.FULLY_STATIC) + .setLinkingMode(Link.LinkingMode.LEGACY_FULLY_STATIC) .setLibraryIdentifier("foo") .setNativeDeps(true); @@ -659,7 +658,7 @@ public class CppLinkActionTest extends BuildViewTestCase { public void testStaticLinkWithWholeArchiveIsError() throws Exception { CppLinkActionBuilder builder = createLinkBuilder(LinkTargetType.STATIC_LIBRARY) - .setLinkStaticness(LinkStaticness.FULLY_STATIC) + .setLinkingMode(Link.LinkingMode.LEGACY_FULLY_STATIC) .setLibraryIdentifier("foo") .setWholeArchive(true); @@ -845,7 +844,7 @@ public class CppLinkActionTest extends BuildViewTestCase { ImmutableList.of(), ImmutableList.of(), getMockFeatureConfiguration()) - .setLinkStaticness(LinkStaticness.MOSTLY_STATIC) + .setLinkingMode(Link.LinkingMode.STATIC) .addLinkopts(ImmutableList.of("-pie", "-other", "-pie")) .setLibraryIdentifier("foo") .build(); @@ -865,7 +864,7 @@ public class CppLinkActionTest extends BuildViewTestCase { ImmutableList.of(), ImmutableList.of(), getMockFeatureConfiguration()) - .setLinkStaticness(LinkStaticness.MOSTLY_STATIC) + .setLinkingMode(Link.LinkingMode.STATIC) .addLinkopts(ImmutableList.of("-pie", "-other", "-pie")) .build(); |