From 29d5176deb29231fb39a1cbe52471be1d18cd068 Mon Sep 17 00:00:00 2001
From: Ralf Schmelter <ralf.schmelter@sap.com>
Date: Thu, 30 Jul 2026 20:36:17 +0200
Subject: [PATCH 1/2] Don't run test using jmc on static JVM builds.

---
 .../HeapDump/PartialArrayContentTest.java      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java b/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java
index 48f9024d15a..788c87bad99 100644
--- a/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java
+++ b/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java
@@ -41,8 +41,17 @@
  * @test
  * @summary Checks if -XX:+LimitPrimitiveArrayContentInHeapDump works.
  * @requires os.maxMemory > 4G
+ * @requires !jdk.static
  * @library /test/lib
- * @run driver PartialArrayContentTest
+ * @run driver PartialArrayContentTest jmc
+ */
+
+/*
+ * @test
+ * @summary Checks if -XX:+LimitPrimitiveArrayContentInHeapDump works.
+ * @requires os.maxMemory > 4G
+ * @library /test/lib
+ * @run driver PartialArrayContentTest oom
  */
 class ArrayAllocApp extends LingeredApp {
     public static int arraySize = 54321;
@@ -91,8 +100,11 @@ public class PartialArrayContentTest {
     private static int nonCharLikeLimit = 50;
 
     public static void main(String[] args) throws Exception {
-        checkPartialContentWithJcmd();
-        checkPartialContentWithOOM();
+        if (args[0].equals("jmc")) {
+            checkPartialContentWithJcmd();
+        } else {
+            checkPartialContentWithOOM();
+        }
     }
 
     public static void checkPartialContentWithJcmd() throws Exception {

From 3b5b4c754b87a7ab2c65e617e80d0b2c471e0087 Mon Sep 17 00:00:00 2001
From: Ralf Schmelter <ralf.schmelter@sap.com>
Date: Fri, 31 Jul 2026 11:17:00 +0200
Subject: [PATCH 2/2] It's jcmd not jmc.

---
 .../serviceability/HeapDump/PartialArrayContentTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java b/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java
index 788c87bad99..02ddfdd4658 100644
--- a/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java
+++ b/test/hotspot/jtreg/serviceability/HeapDump/PartialArrayContentTest.java
@@ -43,7 +43,7 @@
  * @requires os.maxMemory > 4G
  * @requires !jdk.static
  * @library /test/lib
- * @run driver PartialArrayContentTest jmc
+ * @run driver PartialArrayContentTest jcmd
  */
 
 /*
@@ -100,7 +100,7 @@ public class PartialArrayContentTest {
     private static int nonCharLikeLimit = 50;
 
     public static void main(String[] args) throws Exception {
-        if (args[0].equals("jmc")) {
+        if (args[0].equals("jcmd")) {
             checkPartialContentWithJcmd();
         } else {
             checkPartialContentWithOOM();