diff options
| author |  hlopko <hlopko@google.com> | 2017-05-30 13:50:04 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-05-30 16:43:53 +0200 |
| commit | 573916acd2551772645a2f23ce3087771ed1d1e8 (patch) | |
| tree | c0d7d503258bd09e62880452852fcaa4c9640c21 /src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | |
| parent | 84a8e95910f069dd03a19b0fc634f95bb0beac95 (diff) | |
Add FeatureSpecification.
RELNOTES: None.
PiperOrigin-RevId: 157450873
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 32 |
1 files changed, 21 insertions, 11 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 20814450e6..fb8ebbbe8f 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 @@ -89,12 +89,15 @@ public class CppLinkActionTest extends BuildViewTestCase { "dynamic_library_linker_tool", true)) .getFeatureConfiguration( - Link.LinkTargetType.EXECUTABLE.getActionName(), - Link.LinkTargetType.DYNAMIC_LIBRARY.getActionName(), - Link.LinkTargetType.STATIC_LIBRARY.getActionName(), - Link.LinkTargetType.PIC_STATIC_LIBRARY.getActionName(), - Link.LinkTargetType.ALWAYS_LINK_STATIC_LIBRARY.getActionName(), - Link.LinkTargetType.ALWAYS_LINK_PIC_STATIC_LIBRARY.getActionName()); + FeatureSpecification.create( + ImmutableSet.of( + Link.LinkTargetType.EXECUTABLE.getActionName(), + Link.LinkTargetType.DYNAMIC_LIBRARY.getActionName(), + Link.LinkTargetType.STATIC_LIBRARY.getActionName(), + Link.LinkTargetType.PIC_STATIC_LIBRARY.getActionName(), + Link.LinkTargetType.ALWAYS_LINK_STATIC_LIBRARY.getActionName(), + Link.LinkTargetType.ALWAYS_LINK_PIC_STATIC_LIBRARY.getActionName()), + ImmutableSet.<String>of())); } @Test @@ -115,7 +118,10 @@ public class CppLinkActionTest extends BuildViewTestCase { " tool_path: 'toolchain/mock_tool'", " }", "}") - .getFeatureConfiguration("a", Link.LinkTargetType.EXECUTABLE.getActionName()); + .getFeatureConfiguration( + FeatureSpecification.create( + ImmutableSet.of("a", Link.LinkTargetType.EXECUTABLE.getActionName()), + ImmutableSet.<String>of())); CppLinkAction linkAction = createLinkBuilder( @@ -233,7 +239,8 @@ public class CppLinkActionTest extends BuildViewTestCase { " env_entry { key: 'foo', value: 'bar' }", " }", "}") - .getFeatureConfiguration("a"); + .getFeatureConfiguration( + FeatureSpecification.create(ImmutableSet.of("a"), ImmutableSet.<String>of())); CppLinkAction linkAction = createLinkBuilder( @@ -568,9 +575,12 @@ public class CppLinkActionTest extends BuildViewTestCase { " implies: 'dynamic_library_linker_tool'", "}") .getFeatureConfiguration( - "build_interface_libraries", - "dynamic_library_linker_tool", - LinkTargetType.DYNAMIC_LIBRARY.getActionName()); + FeatureSpecification.create( + ImmutableSet.of( + "build_interface_libraries", + "dynamic_library_linker_tool", + LinkTargetType.DYNAMIC_LIBRARY.getActionName()), + ImmutableSet.<String>of())); CppLinkActionBuilder builder = createLinkBuilder( LinkTargetType.DYNAMIC_LIBRARY, |