diff options
| author |  hlopko <hlopko@google.com> | 2017-12-12 07:51:20 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-12 07:53:02 -0800 |
| commit | 916e303047300b1256dd10b58f4070aa8688281f (patch) | |
| tree | 2275436094c500ad3efa9b209f2b11c941a1ee79 /src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | |
| parent | 94c5c05383284cd96defb75f2fa54dab2346f9b5 (diff) | |
Automated rollback of commit 367f704e71f352b404df38161f4c367b9ff506c9.
*** Reason for rollback ***
Rollforward of https://github.com/bazelbuild/bazel/commit/c861c0afd9a4df283936218b9e5b33c452b07c95 after fixing fake link actions.
*** Original change description ***
Rollback of 178106899.
RELNOTES: Linkstamping is now a separate and full-blown CppCompileAction, it's
no longer a part of linking command.
PiperOrigin-RevId: 178760072
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 | 14 |
1 files changed, 0 insertions, 14 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 a0154f0bda..eae60c6c13 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 @@ -283,7 +283,6 @@ public class CppLinkActionTest extends BuildViewTestCase { private enum NonStaticAttributes { OUTPUT_FILE, - COMPILATION_INPUTS, NATIVE_DEPS, USE_TEST_ONLY_FLAGS, FAKE, @@ -301,8 +300,6 @@ public class CppLinkActionTest extends BuildViewTestCase { final PathFragment dynamicOutputPath = PathFragment.create("dummyRuleContext/output/path.so"); final Artifact staticOutputFile = getBinArtifactWithNoOwner(exeOutputPath.getPathString()); final Artifact dynamicOutputFile = getBinArtifactWithNoOwner(dynamicOutputPath.getPathString()); - final Artifact oFile = getSourceArtifact("cc/a.o"); - final Artifact oFile2 = getSourceArtifact("cc/a2.o"); final FeatureConfiguration featureConfiguration = getMockFeatureConfiguration(); ActionTester.runTest( @@ -322,10 +319,6 @@ public class CppLinkActionTest extends BuildViewTestCase { CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext), featureConfiguration, MockCppSemantics.INSTANCE) {}; - builder.addCompilationInputs( - attributesToFlip.contains(NonStaticAttributes.COMPILATION_INPUTS) - ? ImmutableList.of(oFile) - : ImmutableList.of(oFile2)); if (attributesToFlip.contains(NonStaticAttributes.OUTPUT_FILE)) { builder.setLinkType(LinkTargetType.DYNAMIC_LIBRARY); builder.setLibraryIdentifier("foo"); @@ -350,7 +343,6 @@ public class CppLinkActionTest extends BuildViewTestCase { private enum StaticKeyAttributes { OUTPUT_FILE, - COMPILATION_INPUTS } /** @@ -364,8 +356,6 @@ public class CppLinkActionTest extends BuildViewTestCase { final PathFragment dynamicOutputPath = PathFragment.create("dummyRuleContext/output/path.so"); final Artifact staticOutputFile = getBinArtifactWithNoOwner(staticOutputPath.getPathString()); final Artifact dynamicOutputFile = getBinArtifactWithNoOwner(dynamicOutputPath.getPathString()); - final Artifact oFile = getSourceArtifact("cc/a.o"); - final Artifact oFile2 = getSourceArtifact("cc/a2.o"); final FeatureConfiguration featureConfiguration = getMockFeatureConfiguration(); ActionTester.runTest( @@ -385,10 +375,6 @@ public class CppLinkActionTest extends BuildViewTestCase { CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext), featureConfiguration, MockCppSemantics.INSTANCE) {}; - builder.addCompilationInputs( - attributes.contains(StaticKeyAttributes.COMPILATION_INPUTS) - ? ImmutableList.of(oFile) - : ImmutableList.of(oFile2)); builder.setLinkType( attributes.contains(StaticKeyAttributes.OUTPUT_FILE) ? LinkTargetType.STATIC_LIBRARY |