8266056: runtime/stringtable/StringTableCleaningTest.java failed with…

… "RuntimeException: Missing Callback in [10, 11]"
openjdk · Apr 30, 2021 · f98123c · f98123c
1 parent e9370a1
commit f98123c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -63,4 +63,3 @@ serviceability/sa/TestSysProps.java                           8220624   generic-
 serviceability/sa/sadebugd/DebugdConnectTest.java             8220624   generic-all
 serviceability/sa/sadebugd/DisableRegistryTest.java           8220624   generic-all
 vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java 8260303 windows-x64
-runtime/stringtable/StringTableCleaningTest.java              8266056   linux-aarch64
diff --git a/test/hotspot/jtreg/runtime/stringtable/StringTableCleaningTest.java b/test/hotspot/jtreg/runtime/stringtable/StringTableCleaningTest.java
@@ -59,6 +59,8 @@ public static void main(String[] args) throws Exception {
         subargs.add(Tester.class.getName());
         subargs.addAll(Arrays.asList(args));
         OutputAnalyzer output = ProcessTools.executeTestJvm(subargs);
+        output.outputTo(System.out);
+        output.errorTo(System.out);
         output.shouldHaveExitValue(0);
         checkOutput(output);
     }
@@ -82,7 +84,8 @@ private static int fail(String msg) throws Exception {
     private static final String g1Suffix = "Pause(?! Cleanup)";
 
     // Suffix for ZGC.
-    private static final String zSuffix = "Garbage Collection";
+    private static final String zStartSuffix = "Garbage Collection (.*)$";
+    private static final String zEndSuffix = "Garbage Collection (.*) .*->.*$";
 
     // Suffix for Shenandoah.
     private static final String shenSuffix = "Concurrent weak roots";
@@ -93,7 +96,7 @@ private static String getGcStartString() {
         } else if (GC.G1.isSelected()) {
             return gcStartPrefix + g1Suffix;
         } else if (GC.Z.isSelected()) {
-            return gcStartPrefix + zSuffix;
+            return gcStartPrefix + zStartSuffix;
         } else if (GC.Shenandoah.isSelected()) {
             return gcStartPrefix + shenSuffix;
         } else {
@@ -107,7 +110,7 @@ private static String getGcEndString() {
         } else if (GC.G1.isSelected()) {
             return gcEndPrefix + g1Suffix;
         } else if (GC.Z.isSelected()) {
-            return gcEndPrefix + zSuffix;
+            return gcEndPrefix + zEndSuffix;
         } else if (GC.Shenandoah.isSelected()) {
             return gcEndPrefix + shenSuffix;
         } else {
@@ -183,7 +186,7 @@ private static int findCallback(List<String> lines, int gcStart)
                 fail("Two Starts: " + gcStart + ", " + i);
             }
         }
-        return fail("Missing Callback for Start: " + gcStart);
+        return -1;
     }
 
     // Search the lines for the first GC end log line in lines, starting