From 05efc1fa991c3fd895bf2f7c7d9e7916692b98e6 Mon Sep 17 00:00:00 2001
From: Simon Tooke <stooke@openjdk.org>
Date: Mon, 3 Nov 2025 02:20:17 +0000
Subject: [PATCH] 8370578: SystemMapTest.java#normal fails intermittendly on
 macOS aarch64

Reviewed-by: cjplummer, sspitsyn, stuefe
---
 .../serviceability/dcmd/vm/SystemMapTestBase.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
index 1447012073a..beca2bac48c 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
@@ -179,7 +179,8 @@ public class SystemMapTestBase {
 
         static final String macow = "cow";
         static final String macprivate = "pvt";
-        static final String macprivate_or_shared = "(pvt|tsh|cow|p/a)";
+        static final String macprivate_or_shared = "(pvt|shr)";
+        static final String macmem = "(pvt|tsh|cow|p/a)";
         static final String macprivatealiased = "p/a";
 
         static final String macOSbase = range + space + someSize + space + macprot + space;
@@ -187,8 +188,11 @@ public class SystemMapTestBase {
         static final String shouldMatchUnconditionally_macOS[] = {
             // java launcher
             macOSbase + macow + space + someNumber + space + "/.*/bin/java",
-            // we should see the hs-perf data file, and it should appear as shared as well as committed
-            macOSbase + macprivate + space + someNumber + space + ".*/.*/hsperfdata_.*"
+            /*
+             * We should see the hs-perf data file, and it should appear as shared as well as committed.
+             * In the jtreg tests this segment appears private.
+             */
+            macOSbase + macprivate_or_shared + space + someNumber + space + ".*/.*/hsperfdata_.*"
         };
 
         static final String shouldMatch_macOS_libjvm[] = {
@@ -198,7 +202,7 @@ public class SystemMapTestBase {
 
         static final String shouldMatchIfNMTIsEnabled_macOS[] = {
             // heap is private with G1GC, shared with ZGC
-            macOSbase + macprivate_or_shared + space + someNumber + space + "JAVAHEAP.*",
+            macOSbase + macmem + space + someNumber + space + "JAVAHEAP.*",
             // metaspace
             macOSbase + macprivate + space + someNumber + space + "META.*",
             // code cache