diff options
| author |  Googler <noreply@google.com> | 2017-08-29 21:50:45 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-08-30 13:48:01 +0200 |
| commit | 2c2810e3fbe941b803362d233390f4d75248dacf (patch) | |
| tree | 2bfe620ae202a92cdeade2c3aaad0ab72a25ea20 /src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | |
| parent | 185f6938a47b01fa7f542a3365e09860c1023570 (diff) | |
Narrow the LinkCommandLine API.
Previously it had too many essentially identical accessors. This trims it down a bit and adjusts the call sites.
This cl changes the command line passed to tests slightly - now they can possibly contain linkstamping command prepended to actual linker invocation.
RELNOTES: None.
PiperOrigin-RevId: 166888575
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | 8 |
1 files changed, 3 insertions, 5 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 a388e41943..084b03325c 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 @@ -289,8 +289,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { action.getLinkCommandLine().getBuildInfoHeaderArtifacts()); assertThat(cppLinkInfo.getBuildInfoHeaderArtifactList()) .containsExactlyElementsIn(buildInfoHeaderArtifacts); - assertThat(cppLinkInfo.getLinkOptList()) - .containsExactlyElementsIn(action.getLinkCommandLine().getRawLinkArgv()); + assertThat(cppLinkInfo.getLinkOptList()).containsExactlyElementsIn(action.getArguments()); } @Test @@ -324,8 +323,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { action.getLinkCommandLine().getBuildInfoHeaderArtifacts()); assertThat(cppLinkInfo.getBuildInfoHeaderArtifactList()) .containsExactlyElementsIn(buildInfoHeaderArtifacts); - assertThat(cppLinkInfo.getLinkOptList()) - .containsExactlyElementsIn(action.getLinkCommandLine().getRawLinkArgv()); + assertThat(cppLinkInfo.getLinkOptList()).containsExactlyElementsIn(action.getArguments()); } @Test @@ -340,7 +338,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { CppLinkAction action = (CppLinkAction) getGeneratingAction(archive); - assertThat(action.getArgv()).contains(archive.getExecPathString()); + assertThat(action.getArguments()).contains(archive.getExecPathString()); } @Test |