commit ecb0e8458a985edc6b9495d99b7d61a9562967c3
author Jinseong Jeon <jsjeon@google.com> Wed Jun 27 16:17:12 2018 -0700
committer Jinseong Jeon <jsjeon@google.com> Wed Jun 27 16:17:12 2018 -0700
tree e222da15402da9bdd4b5d49a3dc099e564c95b8f
parent 93257f5940bf1b388d835132ef4ddacaf3a79aeb

Fix expected error type of InvokeTypeConversionTest for older VMs

Bug: 72109068
Change-Id: I50c26e581c8d109204dab0cb02cdfe53d5e39515

src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java

diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java
index fce1f4c..1f97c11 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java
@@ -12,6 +12,7 @@
 
 import com.android.tools.r8.R8Command;
 import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.ToolHelper.ProcessResult;
 import com.android.tools.r8.VmTestRunner;
 import com.android.tools.r8.code.InvokeDirect;
@@ -101,7 +102,10 @@
   public void invokeDirectToAlreadyStaticMethod() throws Exception {
     SmaliBuilder builder = buildTestClass(
         "invoke-direct { v1 }, L" + CLASS_NAME + ";->bar()I");
-    run(builder, "IncompatibleClassChangeError", dexInspector -> {
+    String expectedError =
+        ToolHelper.getDexVm().getVersion().isOlderThanOrEqual(Version.V4_4_4)
+            ? "VerifyError" : "IncompatibleClassChangeError";
+    run(builder, expectedError, dexInspector -> {
       ClassSubject clazz = dexInspector.clazz(CLASS_NAME);
       assertThat(clazz, isPresent());
       DexEncodedMethod method = getMethod(dexInspector, main);