commit 8d8fc48664205e433cfa5540753b38043d918873
author Andreas Gampe <agampe@google.com> Fri Mar 25 16:24:20 2016 -0700
committer Andreas Gampe <agampe@google.com> Fri Mar 25 16:50:15 2016 -0700
tree 5662cfe24c49f244672bf0f69575758791765314
parent 0a4d6b9faaaa2652c42679df2a72c78485ed9c64

ART: Relax verifier checks

Only bail for unresolved merge types in a couple of cases. Follow-up
to bb18a03c44d99b3cae232d445d56e80d8388cca9.

Bug: 27799205
Change-Id: If448e14036bc5e245677e0cd8cdddee02b320525

test/800-smali/src/Main.java

diff --git a/test/800-smali/src/Main.java b/test/800-smali/src/Main.java
index 20c3065..2001cb4 100644
--- a/test/800-smali/src/Main.java
+++ b/test/800-smali/src/Main.java
@@ -173,6 +173,7 @@
                 new VerifyError(), null));
         testCases.add(new TestCase("b/27799205 (5)", "B27799205Helper", "run5", null,
                 new VerifyError(), null));
+        testCases.add(new TestCase("b/27799205 (6)", "B27799205Helper", "run6", null, null, null));
     }
 
     public void runTests() {