diff options
author | Lukacs Berki <lberki@google.com> | 2017-02-02 11:42:49 +0000 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-02-02 17:00:21 +0000 |
commit | b99907661b785b0423cb2474da73205595b91fdd (patch) | |
tree | 9c258750e77e831e878fff9a3cd85e3796dfd327 /src/test/java/com/google/devtools/build/lib/rules | |
parent | cd8dde77ad57ade56d8dd153b1d9abd35fef46a7 (diff) |
Rollback of commit e2239cc61ca170ff9a65e1a94c3344d2b272c9e2.
*** Reason for rollback ***
Breaks //nlp/pragma/similarities/learners:abe_test :
blaze test -c opt //nlp/pragma/similarities/learners:abe_test
See []
*** Original change description ***
Expose rpath entries as a build variable
--
PiperOrigin-RevId: 146347832
MOS_MIGRATED_REVID=146347832
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 0e2adddcb3..75e7cd912b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -39,7 +39,6 @@ import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariableValue; import com.google.devtools.build.lib.rules.cpp.CppLinkActionConfigs.CppLinkPlatform; import com.google.devtools.build.lib.rules.cpp.Link.LinkStaticness; import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType; @@ -49,7 +48,6 @@ import com.google.devtools.build.lib.util.OS; import com.google.devtools.build.lib.util.OsUtils; import com.google.devtools.build.lib.vfs.PathFragment; import java.io.IOException; -import java.util.ArrayList; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; @@ -89,10 +87,7 @@ public class CppLinkActionTest extends BuildViewTestCase { private final FeatureConfiguration getMockFeatureConfiguration() throws Exception { return CcToolchainFeaturesTest.buildFeatures( CppLinkActionConfigs.getCppLinkActionConfigs( - CppLinkPlatform.LINUX, - ImmutableSet.<String>of(), - "dynamic_library_linker_tool", - true)) + CppLinkPlatform.LINUX, ImmutableSet.<String>of(), "dynamic_library_linker_tool")) .getFeatureConfiguration( Link.LinkTargetType.EXECUTABLE.getActionName(), Link.LinkTargetType.DYNAMIC_LIBRARY.getActionName(), @@ -163,34 +158,6 @@ public class CppLinkActionTest extends BuildViewTestCase { } @Test - public void testExposesRuntimeLibrarySearchDirectoriesVariable() throws Exception { - scratch.file( - "x/BUILD", - "cc_binary(", - " name = 'foo',", - " srcs = ['some-dir/bar.so', 'some-other-dir/qux.so'],", - ")"); - scratch.file("x/some-dir/bar.so"); - scratch.file("x/some-other-dir/qux.so"); - - ConfiguredTarget configuredTarget = getConfiguredTarget("//x:foo"); - CppLinkAction linkAction = - (CppLinkAction) - getGeneratingAction(configuredTarget, "x/foo" + OsUtils.executableExtension()); - - Iterable<? extends VariableValue> runtimeLibrarySearchDirectories = - linkAction - .getLinkCommandLine() - .getBuildVariables() - .getSequenceVariable(CppLinkActionBuilder.RUNTIME_LIBRARY_SEARCH_DIRECTORIES_VARIABLE); - List<String> directories = new ArrayList<>(); - for (VariableValue value : runtimeLibrarySearchDirectories) { - directories.add(value.getStringValue("runtime_library_search_directory")); - } - assertThat(Joiner.on(" ").join(directories)).matches(".*some-dir .*some-other-dir"); - } - - @Test public void testCompilesTestSourcesIntoDynamicLibrary() throws Exception { if (OS.getCurrent() == OS.WINDOWS) { // Skip the test on Windows. |