commit e790fa569c271c5735718a1f97faa4bce19b96f2
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 27 15:13:39 2018 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 27 15:13:39 2018 +0200
tree 474ac36f9b377b2bf77f0e743fe6e550dd402d5e
parent 22ca7fc6355d4024d47cb1fa920892ef2afdbb72

Update B116282409 test for old VMs

Bug: 116282409
Change-Id: Ib88d722d67c33701f60326a7b774b04f19ef0332

src/test/java/com/android/tools/r8/ir/optimize/B116282409.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/B116282409.java b/src/test/java/com/android/tools/r8/ir/optimize/B116282409.java
index 6ea10cd..6fe1f16 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/B116282409.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/B116282409.java
@@ -11,6 +11,8 @@
 import static org.junit.Assert.assertThat;
 
 import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
 import com.android.tools.r8.ToolHelper.ProcessResult;
 import com.android.tools.r8.jasmin.JasminBuilder;
 import com.android.tools.r8.jasmin.JasminBuilder.ClassBuilder;
@@ -128,8 +130,16 @@
       assertThat(vmResult.stderr, containsString("Call to wrong initialization method"));
     } else {
       assert backend == Backend.DEX;
-      assertEquals(0, vmResult.exitCode);
-      assertEquals(String.join(System.lineSeparator(), "In A.<init>()", "42", ""), vmResult.stdout);
+      if (ToolHelper.getDexVm().isOlderThanOrEqual(DexVm.ART_4_4_4_HOST)) {
+        assertNotEquals(0, vmResult.exitCode);
+        assertThat(
+            vmResult.stderr,
+            containsString("VFY: invoke-direct <init> on super only allowed for 'this' in <init>"));
+      } else {
+        assertEquals(0, vmResult.exitCode);
+        assertEquals(
+            String.join(System.lineSeparator(), "In A.<init>()", "42", ""), vmResult.stdout);
+      }
     }
   }