diff options
| author |  plf <plf@google.com> | 2018-04-20 06:05:25 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-20 06:06:37 -0700 |
| commit | 4d1a3f28ad1b0969d09a65ef19fbda9d5540a05c (patch) | |
| tree | dabe41859f6d59ddb17f3db74553004745f2b3af /src/test/java/com/google/devtools/build | |
| parent | 39d9e1638240cfa3620a20095b9006f34b11eccf (diff) | |
C++: Wraps CcExecutionDynamicLibrariesInfo inside CcLinkingInfo.
RELNOTES:none
PiperOrigin-RevId: 193657227
Diffstat (limited to 'src/test/java/com/google/devtools/build')
3 files changed, 10 insertions, 5 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 8757040f71..e0b0ead3ed 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 @@ -119,7 +119,8 @@ public class CcCommonTest extends BuildViewTestCase { } assertThat( emptylib - .get(CcExecutionDynamicLibrariesInfo.PROVIDER) + .get(CcLinkingInfo.PROVIDER) + .getCcExecutionDynamicLibrariesInfo() .getExecutionDynamicLibraryArtifacts() .isEmpty()) .isTrue(); @@ -231,7 +232,8 @@ public class CcCommonTest extends BuildViewTestCase { " linkstatic=1)"); assertThat( statically - .get(CcExecutionDynamicLibrariesInfo.PROVIDER) + .get(CcLinkingInfo.PROVIDER) + .getCcExecutionDynamicLibrariesInfo() .getExecutionDynamicLibraryArtifacts() .isEmpty()) .isTrue(); 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 d206db176c..bf9ff66ae4 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 @@ -166,7 +166,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly(implInterfaceSharedObjectLink); assertThat( hello - .get(CcExecutionDynamicLibrariesInfo.PROVIDER) + .get(CcLinkingInfo.PROVIDER) + .getCcExecutionDynamicLibrariesInfo() .getExecutionDynamicLibraryArtifacts()) .containsExactly(implSharedObjectLink); } @@ -230,7 +231,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly(sharedObjectLink); assertThat( hello - .get(CcExecutionDynamicLibrariesInfo.PROVIDER) + .get(CcLinkingInfo.PROVIDER) + .getCcExecutionDynamicLibrariesInfo() .getExecutionDynamicLibraryArtifacts()) .containsExactly(implSharedObjectLink); } 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 cc0489f55e..a57d29b301 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 @@ -110,7 +110,8 @@ public final class LibraryLinkingTest extends BuildViewTestCase { Artifact soLib = Iterables.getOnlyElement( ccLib - .get(CcExecutionDynamicLibrariesInfo.PROVIDER) + .get(CcLinkingInfo.PROVIDER) + .getCcExecutionDynamicLibrariesInfo() .getExecutionDynamicLibraryArtifacts()); // This artifact is generated by a SolibSymlinkAction, so we need to go back two levels. CppLinkAction solibLink = |