From 7168bf102d5efbdfba34c9a3632dd4d1f4478e4e Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Wed, 18 Feb 2015 03:16:48 -0800
Subject: [PATCH] 8072835: sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
 Key MaxHeapSize doesnt match

Make sure that maxheapsize is set explicitly in command line

Reviewed-by: sla, ykantser
---
 .../jmap/heapconfig/JMapHeapConfigTest.java      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java b/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
index fe856d736b3..1f9d5f11ffe 100644
--- a/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
+++ b/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
@@ -55,6 +55,8 @@ public class JMapHeapConfigTest {
 
     // ignoring MaxMetaspaceSize
 
+    static final String desiredMaxHeapSize = "-Xmx128m";
+
     private static Map<String, String> parseJMapOutput(List<String> jmapOutput) {
         Map<String, String> heapConfigMap = new HashMap<String, String>();
         boolean shouldParse = false;
@@ -110,9 +112,23 @@ public class JMapHeapConfigTest {
     public static void main(String[] args) {
         System.out.println("Starting JMapHeapConfigTest");
 
+        boolean mx_found = false;
+        List<String> jvmOptions = Utils.getVmOptions();
+        for (String option : jvmOptions) {
+            if (option.startsWith("-Xmx")) {
+               System.out.println("INFO: maximum heap size set by JTREG as " + option);
+               mx_found = true;
+               break;
+           }
+        }
+
         // Forward vm options to LingeredApp
         ArrayList<String> cmd = new ArrayList();
         cmd.addAll(Utils.getVmOptions());
+        if (!mx_found) {
+            cmd.add(desiredMaxHeapSize);
+            System.out.println("INFO: maximum heap size set explicitly as " + desiredMaxHeapSize);
+        }
         cmd.add("-XX:+PrintFlagsFinal");
 
         TmtoolTestScenario tmt = TmtoolTestScenario.create("jmap", "-heap");