commit 17d6885eb0d1ab0de94ce00c22058f22eba97a99
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 15 08:01:06 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 15 08:01:06 2018 +0000
tree 5fc62123316460329855be9649585397ecc691f2
parent 223d2e6fb9ab6ec6d7aef1f0258bad7e66439a97
parent b758e833f789b9ec366a4adb8dffdc27a9947100

Merge "Handle non-standard invoke-super in class merging"

src/test/java/com/android/tools/r8/JctfTestSpecifications.java

diff --git a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
index 258aa43..ee82fc4 100644
--- a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
+++ b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
@@ -1920,11 +1920,6 @@
           // 1) t03
           // java.lang.AssertionError: expected null, but was:<[I@1b32f32>
 
-          .put("lang.ref.WeakReference.isEnqueued.WeakReference_isEnqueued_A01",
-              match(runtimes(Version.DEFAULT, Version.V7_0_0, Version.V6_0_1, Version.V5_1_1)))
-          // 1) t03
-          // java.lang.AssertionError: reference is not enqueued after 2 sec
-
           .put("lang.StackTraceElement.toString.StackTraceElement_toString_A01",
               match(runtimes(Version.DEFAULT)))
           // 1) t03
@@ -4959,8 +4954,9 @@
           .put("lang.ref.PhantomReference.isEnqueued.PhantomReference_isEnqueued_A01",
               match(runtimesUpTo(Version.V4_4_4)))
 
-          .put("lang.ref.WeakReference.isEnqueued.WeakReference_isEnqueued_A01",
-              match(runtimesUpTo(Version.V4_4_4)))
+          .put("lang.ref.WeakReference.isEnqueued.WeakReference_isEnqueued_A01", any())
+          // 1) t03
+          // java.lang.AssertionError: reference is not enqueued after 2 sec
 
           .put("lang.ref.WeakReference.enqueue.WeakReference_enqueue_A01",
               match(runtimesUpTo(Version.V4_4_4)))