aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-08-25 04:06:17 +0200
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-08-25 12:54:21 +0200
commite2bfb4bb4017b9a50b6e00b84d2fc52856323592 (patch)
tree330f938189fd33b2e5dd6480c5b2fcda32fe85ef /src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
parentb91ef056ce096bfe9f995080264980e418dada80 (diff)
Automated rollback of commit 1af9b1e2238c3b43a2b66233495ecf7b6ef4dcab.
*** Reason for rollback *** Reason for previous rollback was identified as being a memory regression causing some cases to hit java heap limit. Proposal is to increase java heap limit to compensate and just go with the original change. *** Original change description *** Automated rollback of commit 6cfffdf37e11018c7e6e2cabc90440d6d29c819b. PiperOrigin-RevId: 166426608
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java4
1 files changed, 3 insertions, 1 deletions
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 e8533552a5..2c4026e678 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,7 +568,9 @@ public class AppleBinaryTest extends ObjcRuleTestCase {
assertThat(getFirstArtifactEndingWith(binObjectFiles, "DataB.pbobjc.o")).isNull();
Action dataAObjectAction =
getGeneratingAction(getFirstArtifactEndingWith(binObjectFiles, "DataA.pbobjc.o"));
- assertThat(getFirstArtifactEndingWith(dataAObjectAction.getInputs(), "DataB.pbobjc.h"))
+ assertThat(
+ getFirstArtifactEndingWith(
+ getExpandedActionInputs(dataAObjectAction), "DataB.pbobjc.h"))
.isNotNull();
}