8266056: runtime/stringtable/StringTableCleaningTest.java failed with "RuntimeException: Missing Callback in [10, 11]"

Reviewed-by: coleenp, dholmes
This commit is contained in:
Per Liden 2021-05-03 07:28:19 +00:00
parent 8fa50ebdf2
commit c5dc657f0b
2 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -82,7 +82,8 @@ public class StringTableCleaningTest {
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 +94,7 @@ public class StringTableCleaningTest {
} 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 +108,7 @@ public class StringTableCleaningTest {
} 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 +184,7 @@ public class StringTableCleaningTest {
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