stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8305480: test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java failing on 32 bit arm

Browse Source 
Reviewed-by: stuefe, dholmes
This commit is contained in:
Vladimir Petko 2023-04-06 05:06:15 +00:00 committed by Thomas Stuefe
parent 35d22930bb
commit a6a3cf485d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.Platform;
import jdk.test.whitebox.WhiteBox;
@ -318,8 +319,12 @@ public class VirtualAllocCommitMerge {
}
public static void checkCommitted(OutputAnalyzer output, long addr, long size, String sizeString) {
// On ARM Thumb the stack is not walkable, so the location is not available and
// "from" string will not be present in the output.
// Disable assertion for ARM32.
String fromString = Platform.isARM() ? "" : "from.*";
output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ Long.toHexString(addr + size)
+ "\\] committed " + sizeString + " from.*");
+ "\\] committed " + sizeString + " " + fromString);
}
}