8284319: Test runtime/cds/appcds/TestParallelGCWithCDS.java fails in …

…repo-loom Reviewed-by: iklam
openjdk · Apr 25, 2022 · 9b82708 · 9b82708 · openjdk-notifier · Apr 25, 2022
1 parent fb60594
commit 9b82708
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestParallelGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestParallelGCWithCDS.java
@@ -114,12 +114,10 @@ static void test(boolean dumpWithParallel, boolean execWithParallel, boolean use
                 if (out.getExitValue() == 0) {
                     out.shouldContain(HELLO);
                 } else {
-                    String output = out.getStdout() + out.getStderr();
-                    String exp1 = "Too small maximum heap";
-                    String exp2 = "GC triggered before VM initialization completed";
-                    if (!output.contains(exp1) && !output.contains(exp2)) {
-                        throw new RuntimeException("Either '" + exp1 + "' or '" + exp2 + "' must be in stdout/stderr \n");
-                    }
+                    String pattern = "((Too small maximum heap)" +
+                                       "|(GC triggered before VM initialization completed)" +
+                                       "|(java.lang.OutOfMemoryError: Java heap space))";
+                    out.shouldMatch(pattern);
                 }
                 n++;
             }