diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
4 files changed, 42 insertions, 42 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index ce1e9fddcf..1c1eed5af7 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -120,8 +120,8 @@ public class CcCommonTest extends BuildViewTestCase { assertThat( emptylib .get(CcLinkingInfo.PROVIDER) - .getCcExecutionDynamicLibraries() - .getExecutionDynamicLibraryArtifacts() + .getCcDynamicLibrariesForRuntime() + .getDynamicLibrariesForRuntimeArtifacts() .isEmpty()) .isTrue(); } @@ -233,8 +233,8 @@ public class CcCommonTest extends BuildViewTestCase { assertThat( statically .get(CcLinkingInfo.PROVIDER) - .getCcExecutionDynamicLibraries() - .getExecutionDynamicLibraryArtifacts() + .getCcDynamicLibrariesForRuntime() + .getDynamicLibrariesForRuntimeArtifacts() .isEmpty()) .isTrue(); Artifact staticallyDotA = getOnlyElement(getFilesToBuild(statically)); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java index a846306009..0f6ce9bc9d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java @@ -163,33 +163,33 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase { CcLinkParams ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(false, false); Iterable<Artifact> libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - Iterable<Artifact> executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + Iterable<Artifact> dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.so"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sa_Cfoo___Ua/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(false, true); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.so"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sa_Cfoo___Ua/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(true, false); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.so"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sa_Cfoo___Ua/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(true, true); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.so"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sa_Cfoo___Ua/libfoo.so"); } @@ -205,33 +205,33 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase { CcLinkParams ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(false, false); Iterable<Artifact> libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - Iterable<Artifact> executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + Iterable<Artifact> dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src b/libfoo.ifso"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sb_Cfoo___Ub/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(false, true); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src b/libfoo.ifso"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sb_Cfoo___Ub/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(true, false); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src b/libfoo.ifso"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sb_Cfoo___Ub/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(true, true); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src b/libfoo.ifso"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sb_Cfoo___Ub/libfoo.so"); } @@ -246,32 +246,32 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase { CcLinkParams ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(false, false); Iterable<Artifact> libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - Iterable<Artifact> executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + Iterable<Artifact> dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.so"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sa_Cfoo___Ua/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(false, true); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.so"); - assertThat(artifactsToStrings(executionDynamicLibraries)) + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)) .containsExactly("bin _solib_k8/_U_S_Sa_Cfoo___Ua/libfoo.so"); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(true, false); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.a"); - assertThat(artifactsToStrings(executionDynamicLibraries)).isEmpty(); + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)).isEmpty(); ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(true, true); libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.a"); - assertThat(artifactsToStrings(executionDynamicLibraries)).isEmpty(); + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)).isEmpty(); } @Test @@ -301,9 +301,9 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase { CcLinkParams ccLinkParams = target.get(CcLinkingInfo.PROVIDER).getCcLinkParamsStore().getCcLinkParams(false, false); Iterable<Artifact> libraries = LinkerInputs.toNonSolibArtifacts(ccLinkParams.getLibraries()); - Iterable<Artifact> executionDynamicLibraries = ccLinkParams.getExecutionDynamicLibraries(); + Iterable<Artifact> dynamicLibrariesForRuntime = ccLinkParams.getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).containsExactly("src a/libfoo.ifso"); - assertThat(artifactsToStrings(executionDynamicLibraries)).isEmpty(); + assertThat(artifactsToStrings(dynamicLibrariesForRuntime)).isEmpty(); } @Test 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 a1810f03db..9505f052ff 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 @@ -219,8 +219,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { assertThat( hello .get(CcLinkingInfo.PROVIDER) - .getCcExecutionDynamicLibraries() - .getExecutionDynamicLibraryArtifacts()) + .getCcDynamicLibrariesForRuntime() + .getDynamicLibrariesForRuntimeArtifacts()) .containsExactly(implSharedObjectLink); } @@ -284,8 +284,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { assertThat( hello .get(CcLinkingInfo.PROVIDER) - .getCcExecutionDynamicLibraries() - .getExecutionDynamicLibraryArtifacts()) + .getCcDynamicLibrariesForRuntime() + .getDynamicLibrariesForRuntimeArtifacts()) .containsExactly(implSharedObjectLink); } @@ -1431,7 +1431,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { } @Test - public void testCcLinkParamsHasExecutionDynamicLibraries() throws Exception { + public void testCcLinkParamsHasDynamicLibrariesForRuntime() throws Exception { AnalysisMock.get() .ccSupport() .setupCrosstool( @@ -1444,13 +1444,13 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .get(CcLinkingInfo.PROVIDER) .getCcLinkParamsStore() .getCcLinkParams(false, true) - .getExecutionDynamicLibraries(); + .getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).doesNotContain("bin a/libfoo.ifso"); assertThat(artifactsToStrings(libraries)).contains("bin a/libfoo.so"); } @Test - public void testCcLinkParamsHasExecutionDynamicLibrariesWithoutCopyFeature() throws Exception { + public void testCcLinkParamsHasDynamicLibrariesForRuntimeWithoutCopyFeature() throws Exception { useConfiguration("--cpu=k8"); ConfiguredTarget target = scratchConfiguredTarget("a", "foo", "cc_library(name = 'foo', srcs = ['foo.cc'])"); @@ -1459,13 +1459,13 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .get(CcLinkingInfo.PROVIDER) .getCcLinkParamsStore() .getCcLinkParams(false, true) - .getExecutionDynamicLibraries(); + .getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).doesNotContain("bin _solib_k8/liba_Slibfoo.ifso"); assertThat(artifactsToStrings(libraries)).contains("bin _solib_k8/liba_Slibfoo.so"); } @Test - public void testCcLinkParamsDoNotHasExecutionDynamicLibraries() throws Exception { + public void testCcLinkParamsDoNotHaveDynamicLibrariesForRuntime() throws Exception { useConfiguration("--cpu=k8"); ConfiguredTarget target = scratchConfiguredTarget( @@ -1475,7 +1475,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .get(CcLinkingInfo.PROVIDER) .getCcLinkParamsStore() .getCcLinkParams(false, true) - .getExecutionDynamicLibraries(); + .getDynamicLibrariesForRuntime(); assertThat(artifactsToStrings(libraries)).isEmpty(); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java index 7d62b00a79..6a98bc478c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java @@ -111,8 +111,8 @@ public final class LibraryLinkingTest extends BuildViewTestCase { Iterables.getOnlyElement( ccLib .get(CcLinkingInfo.PROVIDER) - .getCcExecutionDynamicLibraries() - .getExecutionDynamicLibraryArtifacts()); + .getCcDynamicLibrariesForRuntime() + .getDynamicLibrariesForRuntimeArtifacts()); // This artifact is generated by a SolibSymlinkAction, so we need to go back two levels. CppLinkAction solibLink = (CppLinkAction) getGeneratingAction(getGeneratingAction(soLib).getPrimaryInput()); |