Skip to content

Commit 05efc1f

Browse files
Simon TookeSendaoYan
authored andcommitted
8370578: SystemMapTest.java#normal fails intermittendly on macOS aarch64
Reviewed-by: cjplummer, sspitsyn, stuefe
1 parent e8a1a87 commit 05efc1f

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,20 @@ private static class MacOSPatterns implements MapPatterns {
179179

180180
static final String macow = "cow";
181181
static final String macprivate = "pvt";
182-
static final String macprivate_or_shared = "(pvt|tsh|cow|p/a)";
182+
static final String macprivate_or_shared = "(pvt|shr)";
183+
static final String macmem = "(pvt|tsh|cow|p/a)";
183184
static final String macprivatealiased = "p/a";
184185

185186
static final String macOSbase = range + space + someSize + space + macprot + space;
186187

187188
static final String shouldMatchUnconditionally_macOS[] = {
188189
// java launcher
189190
macOSbase + macow + space + someNumber + space + "/.*/bin/java",
190-
// we should see the hs-perf data file, and it should appear as shared as well as committed
191-
macOSbase + macprivate + space + someNumber + space + ".*/.*/hsperfdata_.*"
191+
/*
192+
* We should see the hs-perf data file, and it should appear as shared as well as committed.
193+
* In the jtreg tests this segment appears private.
194+
*/
195+
macOSbase + macprivate_or_shared + space + someNumber + space + ".*/.*/hsperfdata_.*"
192196
};
193197

194198
static final String shouldMatch_macOS_libjvm[] = {
@@ -198,7 +202,7 @@ private static class MacOSPatterns implements MapPatterns {
198202

199203
static final String shouldMatchIfNMTIsEnabled_macOS[] = {
200204
// heap is private with G1GC, shared with ZGC
201-
macOSbase + macprivate_or_shared + space + someNumber + space + "JAVAHEAP.*",
205+
macOSbase + macmem + space + someNumber + space + "JAVAHEAP.*",
202206
// metaspace
203207
macOSbase + macprivate + space + someNumber + space + "META.*",
204208
// code cache

0 commit comments

Comments
 (0)