From 1af9b1e2238c3b43a2b66233495ecf7b6ef4dcab Mon Sep 17 00:00:00 2001 From: cpeyser Date: Tue, 1 Aug 2017 23:43:58 +0200 Subject: Automated rollback of commit 6cfffdf37e11018c7e6e2cabc90440d6d29c819b. PiperOrigin-RevId: 163889699 --- .../build/lib/rules/objc/AppleBinaryTest.java | 4 +- .../build/lib/rules/objc/ObjcRuleTestCase.java | 46 +++------------------- 2 files changed, 6 insertions(+), 44 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java index c58c64972c..c78b771a88 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java @@ -568,9 +568,7 @@ public class AppleBinaryTest extends ObjcRuleTestCase { assertThat(getFirstArtifactEndingWith(binObjectFiles, "DataB.pbobjc.o")).isNull(); Action dataAObjectAction = getGeneratingAction(getFirstArtifactEndingWith(binObjectFiles, "DataA.pbobjc.o")); - assertThat( - getFirstArtifactEndingWith( - getExpandedActionInputs(dataAObjectAction), "DataB.pbobjc.h")) + assertThat(getFirstArtifactEndingWith(dataAObjectAction.getInputs(), "DataB.pbobjc.h")) .isNotNull(); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 8116e34c9b..c099a11be3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -91,7 +91,6 @@ import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType; import com.google.devtools.build.lib.rules.apple.AppleToolchain; import com.google.devtools.build.lib.rules.apple.DottedVersion; import com.google.devtools.build.lib.rules.apple.XcodeVersionProperties; -import com.google.devtools.build.lib.rules.cpp.CppCompileAction; import com.google.devtools.build.lib.rules.cpp.CppLinkAction; import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs; import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; @@ -1355,9 +1354,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { assertOnlyRequiredInputsArePresentForBundledCompilation(topTarget); assertCoptsAndDefinesForBundlingTarget(topTarget); assertBundledGroupsGetCreatedAndLinked(topTarget); - if (getObjcCrosstoolMode() == ObjcCrosstoolMode.ALL) { - assertBundledCompilationUsesCrosstool(topTarget); - } } protected ImmutableList getAllObjectFilesLinkedInBin(Artifact bin) { @@ -1456,22 +1452,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { .doesNotContain("protos/data_b.proto"); } - /** - * Ensures that all middleman artifacts in the action input are expanded so that the real inputs - * are also included. - */ - protected Iterable getExpandedActionInputs(Action action) { - List containedArtifacts = new ArrayList<>(); - for (Artifact input : action.getInputs()) { - if (input.isMiddlemanArtifact()) { - Action middlemanAction = getGeneratingAction(input); - Iterables.addAll(containedArtifacts, getExpandedActionInputs(middlemanAction)); - } - containedArtifacts.add(input); - } - return containedArtifacts; - } - private void assertOnlyRequiredInputsArePresentForBundledCompilation(ConfiguredTarget topTarget) { Artifact protoHeaderA = getBinArtifact("_generated_protos/x/protos/DataA.pbobjc.h", topTarget); Artifact protoHeaderB = getBinArtifact("_generated_protos/x/protos/DataB.pbobjc.h", topTarget); @@ -1497,15 +1477,15 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { assertThat(protoObjectActionC).isNotNull(); assertThat(protoObjectActionD).isNotNull(); - assertThat(getExpandedActionInputs(protoObjectActionA)) + assertThat(protoObjectActionA.getInputs()) .containsNoneOf(protoHeaderB, protoHeaderC, protoHeaderD); - assertThat(getExpandedActionInputs(protoObjectActionB)) + assertThat(protoObjectActionB.getInputs()) .containsNoneOf(protoHeaderA, protoHeaderC, protoHeaderD); - assertThat(getExpandedActionInputs(protoObjectActionC)) + assertThat(protoObjectActionC.getInputs()) .containsNoneOf(protoHeaderA, protoHeaderB, protoHeaderD); - assertThat(getExpandedActionInputs(protoObjectActionD)) + assertThat(protoObjectActionD.getInputs()) .containsAllOf(protoHeaderA, protoHeaderC, protoHeaderD); - assertThat(getExpandedActionInputs(protoObjectActionD)) + assertThat(protoObjectActionD.getInputs()) .doesNotContain(protoHeaderB); } @@ -1549,22 +1529,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { .containsAllOf(protosGroup0Lib, protosGroup1Lib, protosGroup2Lib, protosGroup3Lib); } - private void assertBundledCompilationUsesCrosstool(ConfiguredTarget topTarget) { - Artifact protoObjectA = - getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataA.pbobjc.o", topTarget); - Artifact protoObjectB = - getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataB.pbobjc.o", topTarget); - Artifact protoObjectC = - getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataC.pbobjc.o", topTarget); - Artifact protoObjectD = - getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataD.pbobjc.o", topTarget); - - assertThat(getGeneratingAction(protoObjectA)).isInstanceOf(CppCompileAction.class); - assertThat(getGeneratingAction(protoObjectB)).isInstanceOf(CppCompileAction.class); - assertThat(getGeneratingAction(protoObjectC)).isInstanceOf(CppCompileAction.class); - assertThat(getGeneratingAction(protoObjectD)).isInstanceOf(CppCompileAction.class); - } - protected void checkProtoBundlingDoesNotHappen(RuleType ruleType) throws Exception { scratch.file( "protos/BUILD", -- cgit v1.2.3