commit 445958b141e93d31f85c38d2cad39eceea3173a5
author Søren Gjesse <sgjesse@google.com> Mon Sep 30 12:55:43 2024 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Sep 30 11:01:17 2024 +0000
tree a3f3da04a0b1e74626a3ed99dcda727711ba92ba
parent ed3c9728c598c8e7b64ba7043e1331bc3dcb5b73

Update test expectations for issue 370217724

Host ART runtime results vary.

Bug: b/370217724
Change-Id: I03a0e185bf9aa1d983d355193a47ec9df9651b6b

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

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/B370217724Test.java b/src/test/java/com/android/tools/r8/ir/optimize/B370217724Test.java
index 72d45f4..2e862cb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/B370217724Test.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/B370217724Test.java
@@ -3,11 +3,13 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.ir.optimize;
 
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.is;
+
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.TestRuntime.CfVm;
-import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.utils.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,8 +30,9 @@
 
   private static final String OUTPUT_JVM8 = StringUtils.lines("8989.358669383371");
   private static final String OUTPUT_FROM_JVM9 = StringUtils.lines("3695.708516962155");
-  private static final String OUTPUT_UNTIL_API_LEVEL_22 = StringUtils.lines("5753.491198916323");
-  private static final String OUTPUT_FROM_API_LEVEL_23 = StringUtils.lines("10192.673136265881");
+  // Depending on the ART host run environment these results are seen.
+  private static final String OUTPUT_ART_1 = StringUtils.lines("5753.491198916323");
+  private static final String OUTPUT_ART_2 = StringUtils.lines("10192.673136265881");
 
   @Test
   public void testJvm() throws Exception {
@@ -50,10 +53,7 @@
         .addInnerClasses(getClass())
         .setMinApi(parameters)
         .run(parameters.getRuntime(), TestClass.class)
-        .applyIf(
-            parameters.isDexRuntimeVersionNewerThanOrEqual(Version.V6_0_1),
-            r -> r.assertSuccessWithOutput(OUTPUT_FROM_API_LEVEL_23),
-            r -> r.assertSuccessWithOutput(OUTPUT_UNTIL_API_LEVEL_22));
+        .assertSuccessWithOutputThatMatches(anyOf(is(OUTPUT_ART_1), is(OUTPUT_ART_2)));
   }
 
   @Test
@@ -70,11 +70,7 @@
                     parameters.asCfRuntime().isNewerThanOrEqual(CfVm.JDK9)
                         ? OUTPUT_FROM_JVM9
                         : OUTPUT_JVM8),
-            r ->
-                r.assertSuccessWithOutput(
-                    parameters.isDexRuntimeVersionNewerThanOrEqual(Version.V6_0_1)
-                        ? OUTPUT_FROM_API_LEVEL_23
-                        : OUTPUT_UNTIL_API_LEVEL_22));
+            r -> r.assertSuccessWithOutputThatMatches(anyOf(is(OUTPUT_ART_1), is(OUTPUT_ART_2))));
   }
 
   static class TestClass {