diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp')
3 files changed, 18 insertions, 18 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index 0d50d72362..5ab844b922 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -298,7 +298,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { assertThat(cppLinkInfo.getLinkTargetType()) .isEqualTo(action.getLinkCommandLine().getLinkTargetType().name()); assertThat(cppLinkInfo.getLinkStaticness()) - .isEqualTo(action.getLinkCommandLine().getLinkStaticness().name()); + .isEqualTo(action.getLinkCommandLine().getLinkingMode().name()); Iterable<String> linkstamps = Artifact.asExecPaths(action.getLinkstampObjects()); assertThat(cppLinkInfo.getLinkStampList()).containsExactlyElementsIn(linkstamps); Iterable<String> buildInfoHeaderArtifacts = @@ -331,7 +331,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { assertThat(cppLinkInfo.getLinkTargetType()) .isEqualTo(action.getLinkCommandLine().getLinkTargetType().name()); assertThat(cppLinkInfo.getLinkStaticness()) - .isEqualTo(action.getLinkCommandLine().getLinkStaticness().name()); + .isEqualTo(action.getLinkCommandLine().getLinkingMode().name()); Iterable<String> linkstamps = Artifact.asExecPaths(action.getLinkstampObjects()); assertThat(cppLinkInfo.getLinkStampList()).containsExactlyElementsIn(linkstamps); Iterable<String> buildInfoHeaderArtifacts = 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(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index 131bc9ce13..ee07c85aa1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -31,6 +31,7 @@ import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.packages.util.MockCcSupport; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.Tool; +import com.google.devtools.build.lib.rules.cpp.Link.LinkingMode; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.vfs.PathFragment; @@ -536,7 +537,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { // (but test each mode at least once.) assertThat( ccProviderA.configureAllLegacyLinkOptions( - CompilationMode.FASTBUILD, LipoMode.OFF, LinkingMode.FULLY_STATIC)) + CompilationMode.FASTBUILD, LipoMode.OFF, LinkingMode.LEGACY_FULLY_STATIC)) .containsExactly( "linker-flag-A-1", "linker-flag-A-2", @@ -553,14 +554,14 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { .inOrder(); assertThat( ccProviderA.configureAllLegacyLinkOptions( - CompilationMode.OPT, LipoMode.OFF, LinkingMode.FULLY_STATIC)) + CompilationMode.OPT, LipoMode.OFF, LinkingMode.LEGACY_FULLY_STATIC)) .containsExactly( "linker-flag-A-1", "linker-flag-A-2", "fully-static-flag-A-1", "fully-static-flag-A-2") .inOrder(); assertThat( ccProviderA.configureAllLegacyLinkOptions( - CompilationMode.OPT, LipoMode.BINARY, LinkingMode.FULLY_STATIC)) + CompilationMode.OPT, LipoMode.BINARY, LinkingMode.LEGACY_FULLY_STATIC)) .containsExactly( "linker-flag-A-1", "linker-flag-A-2", "fully-static-flag-A-1", "fully-static-flag-A-2") .inOrder(); @@ -629,7 +630,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertThat(CppHelper.getDynamicLinkOptions(toolchainC, ccProviderC, true)).isEmpty(); assertThat( ccProviderC.configureAllLegacyLinkOptions( - CompilationMode.FASTBUILD, LipoMode.OFF, LinkingMode.FULLY_STATIC)) + CompilationMode.FASTBUILD, LipoMode.OFF, LinkingMode.LEGACY_FULLY_STATIC)) .isEmpty(); assertThat( ccProviderC.configureAllLegacyLinkOptions( @@ -637,7 +638,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { .isEmpty(); assertThat( ccProviderC.configureAllLegacyLinkOptions( - CompilationMode.OPT, LipoMode.OFF, LinkingMode.FULLY_STATIC)) + CompilationMode.OPT, LipoMode.OFF, LinkingMode.LEGACY_FULLY_STATIC)) .isEmpty(); assertThat(ccProviderC.getObjCopyOptionsForEmbedding()).isEmpty(); assertThat(ccProviderC.getLdOptionsForEmbedding()).isEmpty(); |