commit a53fde111d369ac0866adb6d5f09250fe69ecd82
author Ian Zerny <zerny@google.com> Tue Nov 21 07:54:57 2023 +0100
committer Ian Zerny <zerny@google.com> Tue Nov 21 07:21:00 2023 +0000
tree c60a82d85d7624695a383efe6fe207985123e76d
parent ed98ca17aa03a0b401bf19f355ed340b6c15420d

Add additional check for status on flaky test

Change-Id: I6ca6580b5333ff65dd24ac1278e78f349f62a838

src/test/java/com/android/tools/r8/desugar/backports/LongBackportJava9Test.java

diff --git a/src/test/java/com/android/tools/r8/desugar/backports/LongBackportJava9Test.java b/src/test/java/com/android/tools/r8/desugar/backports/LongBackportJava9Test.java
index 7404eed..40a457d 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/LongBackportJava9Test.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/LongBackportJava9Test.java
@@ -5,6 +5,7 @@
 package com.android.tools.r8.desugar.backports;
 
 import static com.android.tools.r8.utils.FileUtils.JAR_EXTENSION;
+import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.containsString;
 
 import com.android.tools.r8.SingleTestRunResult;
@@ -52,7 +53,11 @@
             runResult.applyIf(
                 parameters.getDexRuntimeVersion().isEqualTo(Version.V6_0_1)
                     && parameters.getApiLevel().isGreaterThan(AndroidApiLevel.B),
-                rr -> rr.assertFailureWithErrorThatMatches(containsString("SIGSEGV")),
+                rr ->
+                    rr.assertFailureWithErrorThatMatches(
+                        // Sometimes the failure does not have the SIGSEGV printed, so check for
+                        // the utils.cc file where the fault happens.
+                        anyOf(containsString("SIGSEGV"), containsString("art/runtime/utils.cc"))),
                 SingleTestRunResult::assertSuccess));
   }
 }