diff options
author | 2016-10-11 15:30:49 +0000 | |
---|---|---|
committer | 2016-10-12 08:55:07 +0000 | |
commit | 74b94328db5346e0f6c573731fcbaa85ca751304 (patch) | |
tree | cab3cab9a81aab6bea2016b2567039661f682324 /src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java | |
parent | 671045b8fd9cc53d208af6eb38dab5c1fb543545 (diff) |
Move interface so building to action configs
This cl moves the conditional building of interface libraries from LinkCommandLine to action configs and features. It provides link_dynamic_library.sh to keep blaze backwards compatible. The script and related code can be deleted once all crosstools are updated.
RELNOTES: No.
--
MOS_MIGRATED_REVID=135799041
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
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 3adb69ec75..30adaf693c 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 @@ -21,13 +21,11 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; - +import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; - /** * Test for shared library linking {@link CppLinkAction}. */ @@ -35,8 +33,9 @@ import java.util.List; public final class LibraryLinkingTest extends BuildViewTestCase { private List<String> getLinkOpts(CppLinkAction linkAction, String... optionPatterns) throws Exception { - // Strip the first parameter from the argv, which is the gcc command. - return linkAction.getRawLinkArgv().subList(1, optionPatterns.length + 3); + // Strip the first parameters from the argv, which are the dynamic library script + // (usually tools/cpp/link_dynamic_library.sh), and its arguments. + return linkAction.getRawLinkArgv().subList(6, optionPatterns.length + 6); } private void assertLinkopts(CppLinkAction linkAction, String... optionPatterns) throws Exception { |