diff options
| author |  hlopko <hlopko@google.com> | 2017-12-19 04:02:39 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-19 04:04:49 -0800 |
| commit | 173cae708cc667ef1353b5e65c3b7a62757e5f97 (patch) | |
| tree | c6a9038d77f182aa648386dc25534842b251fa47 /src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | |
| parent | 30ffe79ee7ab1f07b1ebb1eb42c1c4536006f01f (diff) | |
Remove FeatureSpecification, use plain sets instead
RELNOTES: None.
PiperOrigin-RevId: 179534164
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 | 38 |
1 files changed, 14 insertions, 24 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 eae60c6c13..c31e623360 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 @@ -93,15 +93,13 @@ public class CppLinkActionTest extends BuildViewTestCase { /* supportsInterfaceSharedLibraries= */ false), CppActionConfigs.getFeaturesToAppearLastInToolchain(ImmutableSet.of())) .getFeatureConfiguration( - 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())); + 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())); } @Test @@ -117,9 +115,7 @@ public class CppLinkActionTest extends BuildViewTestCase { " }", "}") .getFeatureConfiguration( - FeatureSpecification.create( - ImmutableSet.of("a", Link.LinkTargetType.EXECUTABLE.getActionName()), - ImmutableSet.<String>of())); + ImmutableSet.of("a", Link.LinkTargetType.EXECUTABLE.getActionName())); CppLinkAction linkAction = createLinkBuilder( @@ -144,9 +140,7 @@ public class CppLinkActionTest extends BuildViewTestCase { " execution_requirement: 'dummy-exec-requirement'", " }", "}") - .getFeatureConfiguration( - FeatureSpecification.create( - ImmutableSet.of(LinkTargetType.EXECUTABLE.getActionName()), ImmutableSet.of())); + .getFeatureConfiguration(ImmutableSet.of(LinkTargetType.EXECUTABLE.getActionName())); CppLinkAction linkAction = createLinkBuilder( @@ -266,9 +260,7 @@ public class CppLinkActionTest extends BuildViewTestCase { " }", "}") .getFeatureConfiguration( - FeatureSpecification.create( - ImmutableSet.of(Link.LinkTargetType.EXECUTABLE.getActionName(), "a"), - ImmutableSet.<String>of())); + ImmutableSet.of(Link.LinkTargetType.EXECUTABLE.getActionName(), "a")); CppLinkAction linkAction = createLinkBuilder( @@ -596,12 +588,10 @@ public class CppLinkActionTest extends BuildViewTestCase { " implies: 'dynamic_library_linker_tool'", "}") .getFeatureConfiguration( - FeatureSpecification.create( - ImmutableSet.of( - "build_interface_libraries", - "dynamic_library_linker_tool", - LinkTargetType.DYNAMIC_LIBRARY.getActionName()), - ImmutableSet.<String>of())); + ImmutableSet.of( + "build_interface_libraries", + "dynamic_library_linker_tool", + LinkTargetType.DYNAMIC_LIBRARY.getActionName())); CppLinkActionBuilder builder = createLinkBuilder( LinkTargetType.DYNAMIC_LIBRARY, |