commit cf8b89f658bdae2b99c311c18d6cabc13884ac26
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Jun 04 13:42:27 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Jun 04 13:42:27 2020 +0200
tree 66d9953624b07f84dcec4bac537dd572f9000794
parent cd3cb7f87c501da2b5b342ad65bc57cb8b01866e

Fix expectation for 201-built-in-except-detail-messages (pt. 2)

Change-Id: I4f87b3cf817e7d9039fcf6c26e2234d228dc392a

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

diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 05d85f6..eddf1ee 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -809,9 +809,21 @@
           // Fails due to non-matching Exception messages.
           .put(
               "201-built-in-except-detail-messages",
-              TestCondition.match(
-                  TestCondition.compilers(
-                      CompilerUnderTest.D8, CompilerUnderTest.R8, CompilerUnderTest.R8_AFTER_D8)))
+              TestCondition.or(
+                  TestCondition.match(
+                      TestCondition.compilers(
+                          CompilerUnderTest.D8, CompilerUnderTest.D8_AFTER_R8CF),
+                      TestCondition.runtimes(
+                          DexVm.Version.V4_0_4,
+                          DexVm.Version.V4_4_4,
+                          DexVm.Version.V5_1_1,
+                          DexVm.Version.V6_0_1,
+                          DexVm.Version.V7_0_0)),
+                  TestCondition.match(
+                      TestCondition.compilers(
+                          CompilerUnderTest.R8,
+                          CompilerUnderTest.R8CF,
+                          CompilerUnderTest.R8_AFTER_D8))))
           // Uses dex file version 37 and therefore only runs on Android N and above.
           .put(
               "370-dex-v37",