diff options
author | Peter Schmitt <schmitt@google.com> | 2016-10-25 18:56:37 +0000 |
---|---|---|
committer | John Cater <jcater@google.com> | 2016-10-25 20:20:57 +0000 |
commit | 87342673b739b019b8e8b64137b97dfebf777f86 (patch) | |
tree | c25a63b220c12ebd7f4f1e02fa223943e00dbf21 /src/test/java | |
parent | 03d6302629d8660b25591068ea6682f20fa74ec8 (diff) |
Rollback of commit abb0b633339ef76bf19a1e5af8477d42d13151d8.
*** Reason for rollback ***
breaks bazel linux sandbox
*** Original change description ***
Move -l/-L link opts to FeatureConfiguration
This cl moves -l/-L link opts generation from Java to
FeatureConfiguration making it possible to alter the flags in CROSSTOOL.
Change-Id: I1ea7501435ab7e62992e1e9b0cb7f5e22d52c521
--
MOS_MIGRATED_REVID=137184226
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java index bdca59095e..f3d488fe1f 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java @@ -163,46 +163,6 @@ public class LinkBuildVariablesTest extends BuildViewTestCase { ; } - /** - * TODO(pcloudy): Add test for testing that necessary build variables are populated when - * alwayslink=1. - */ - - /** - * Tests that librarySearchDirectories, dynamicLibrariesToLink, and interfaceLibrariesToLink are - * exposed. - */ - @Test - public void testLinkingLibrariesFlags() throws Exception { - scratch.file( - "app/BUILD", - "cc_binary(", - " name = 'foo',", - " srcs = ['foo.cc', 'libbar.so'],", - " deps = ['//baz:qux'],", - " linkstatic = 0,", - ")"); - scratch.file("baz/BUILD", "cc_library(", " name = 'qux',", " srcs = ['qux.cc'],", ")"); - scratch.file("app/foo.cc"); - scratch.file("app/libbar.so"); - scratch.file("baz/qux.cc"); - - ConfiguredTarget target = getConfiguredTarget("//app:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.EXECUTABLE); - List<String> librarySearchDirectories = - getVariableValue(variables, CppLinkActionBuilder.LIBRARY_SEARCH_DIRECTORIES_VARIABLE); - List<String> dynamicLibrariesToLink = - getVariableValue(variables, CppLinkActionBuilder.DYNAMIC_LIBRARIES_TO_LINK_VARIABLE); - List<String> interfaceLibrariesToLink = - getVariableValue(variables, CppLinkActionBuilder.INTERFACE_LIBRARIES_TO_LINK_VARIABLE); - - assertThat(librarySearchDirectories).hasSize(2); - assertThat(librarySearchDirectories.get(0)).matches(".*app.*foo.*"); - assertThat(dynamicLibrariesToLink).containsExactly("bar"); - assertThat(Iterables.getOnlyElement(interfaceLibrariesToLink)) - .matches(".*libbaz.*libqux.ifso"); - } - @Test public void testInterfaceLibraryBuildingVariablesWhenGenerationPossible() throws Exception { // Make sure the interface shared object generation is enabled in the configuration |