8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string

Reviewed-by: eastigeevich, dholmes
This commit is contained in:
Yi-Fan Tsai 2023-12-06 02:34:26 +00:00 committed by David Holmes
parent 3cd65ce2a4
commit 86b27b784e
2 changed files with 2 additions and 2 deletions
test/hotspot/jtreg

@ -72,7 +72,7 @@ compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x6
compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all
compiler/codecache/CheckLargePages.java 8317831 linux-x64
compiler/codecache/CheckLargePages.java 8319795 linux-x64
compiler/floatingpoint/TestSubnormalFloat.java 8317810 generic-i586
compiler/floatingpoint/TestSubnormalDouble.java 8317810 generic-i586

@ -62,7 +62,7 @@ public class CheckLargePages {
out.shouldMatch("Code cache size too small for \\S* pages\\. Reverting to smaller page size \\((\\S*)\\)\\.");
out.shouldHaveExitValue(0);
// Parse page sizes to find next biggest page
String sizes = out.firstMatch("Usable page sizes:(.*)", 1);
String sizes = out.firstMatch("Usable page sizes:([^.]+)", 1);
List<Long> sizeList = Arrays.stream(sizes.trim().split("\\s*,\\s*")).map(CheckLargePages::parseMemoryString).sorted().toList();
final int smallerPageSizeIndex = sizeList.indexOf(largePageSize) - 1;
Asserts.assertGreaterThanOrEqual(smallerPageSizeIndex, 0);