diff options
| author |  ajmichael <ajmichael@google.com> | 2017-05-02 01:26:33 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-05-02 11:27:05 +0200 |
| commit | bfacec0b3f26b2e851df5a847a51858dbedb45a7 (patch) | |
| tree | 6b7ed1cd55250ee76aaa06076693b578fad8add6 /src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | |
| parent | 336a1302066b96773dc4b19850f85b59bc879928 (diff) | |
Automated g4 rollback of commit d5217515002d468a3095243975e21e89eccc46b7.
*** Reason for rollback ***
Relies on a CL that is being rolled back due to breaking some LIPO builds.
RELNOTES: None
PiperOrigin-RevId: 154776370
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 | 7 |
1 files changed, 3 insertions, 4 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 44d92f05e6..a5358344ce 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 @@ -40,7 +40,7 @@ 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.CppActionConfigs.CppPlatform; +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; import com.google.devtools.build.lib.rules.cpp.Link.Staticness; @@ -83,10 +83,9 @@ public class CppLinkActionTest extends BuildViewTestCase { private final FeatureConfiguration getMockFeatureConfiguration() throws Exception { return CcToolchainFeaturesTest.buildFeatures( - CppActionConfigs.getCppActionConfigs( - CppPlatform.LINUX, + CppLinkActionConfigs.getCppLinkActionConfigs( + CppLinkPlatform.LINUX, ImmutableSet.<String>of(), - "gcc_tool", "dynamic_library_linker_tool", true)) .getFeatureConfiguration( |