8335643: serviceability/dcmd/vm tests fail for ZGC after JDK-8322475

Reviewed-by: sgehwolf, dholmes

Author: tstuefe

test/hotspot/jtreg/ProblemList-generational-zgc.txt

@@ -114,7 +114,4 @@ serviceability/sa/sadebugd/PmapOnDebugdTest.java              8307393   generic-
 serviceability/sa/sadebugd/RunCommandOnServerTest.java        8307393   generic-all
 serviceability/sa/sadebugd/SADebugDTest.java                  8307393   generic-all
 
-serviceability/dcmd/vm/SystemMapTest.java                     8335643   generic-all
-serviceability/dcmd/vm/SystemDumpMapTest.java                 8335643   generic-all
-
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64

test/hotspot/jtreg/ProblemList-zgc.txt

@@ -45,7 +45,4 @@ serviceability/sa/TestSysProps.java                           8302055   generic-
 
 serviceability/sa/TestHeapDumpForInvokeDynamic.java           8315646   generic-all
 
-serviceability/dcmd/vm/SystemMapTest.java                     8335643   generic-all
-serviceability/dcmd/vm/SystemDumpMapTest.java                 8335643   generic-all
-
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64

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

@@ -42,6 +42,8 @@ public class SystemMapTestBase {
     private static final String regexBase_committed = regexBase + "com.*";
     private static final String regexBase_shared_and_committed = regexBase + "shrd,com.*";
 
+    // java heap is either committed, non-shared, or - in case of ZGC - committed and shared.
+    private static final String regexBase_java_heap = regexBase + "(shrd,)?com.*";
     protected static final String shouldMatchUnconditionally[] = {
         // java launcher
         regexBase_committed + "/bin/java",
@@ -54,7 +56,7 @@ public class SystemMapTestBase {
     };
 
     protected static final String shouldMatchIfNMTIsEnabled[] = {
-        regexBase_committed + "JAVAHEAP.*",
+        regexBase_java_heap + "JAVAHEAP.*",
         // metaspace
         regexBase_committed + "META.*",
         // parts of metaspace should be uncommitted