More fixes for TestMaxRAMFlags.java

Author: jsikstro

test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java

@@ -116,30 +116,32 @@ private static boolean getFlagBoolValue(String flag, String where) {
   }
 
   public static void main(String args[]) throws Exception {
-    // Tests
-
-    long M = 1L * 1024L * 1024L;
-
     // Hotspot startup logic reduces MaxHeapForCompressedOops by HeapBaseMinAddress
     // in order to get zero based compressed oops offsets.
     long heapbaseminaddr = getHeapBaseMinAddress();
     long maxcoopheap = TestUseCompressedOopsErgoTools.getMaxHeapForCompressedOops(new String [0]) - heapbaseminaddr;
 
-    double headroom = (double)64 * M;
+    // The headroom is used to get/not get compressed oops from the maxcoopheap size
+    long M = 1L * 1024L * 1024L;
+    long headroom = 64 * M;
+
+    long requiredHostMemory = maxcoopheap + headroom;
 
     // Get host memory
     long hostMemory = getHostMaxMemory();
 
-    if (hostMemory > (maxcoopheap + headroom)) {
-      double MaxRAMPercentage = ((double)maxcoopheap / hostMemory) * 100.0;
-      double headroomPercentage = ((double)headroom / hostMemory) * 100.0;
+    System.out.println("hostMemory: " + hostMemory + ", requiredHostMemory: " + requiredHostMemory);
 
-      // Args: MaxRAMPercentage, forcecoop, expect heap, expect coop
-      checkMaxRAMSize(MaxRAMPercentage - headroomPercentage, false, maxcoopheap - (long)headroom, true);
-      checkMaxRAMSize(MaxRAMPercentage + headroomPercentage, false, maxcoopheap + (long)headroom, false);
-      checkMaxRAMSize(MaxRAMPercentage, true, maxcoopheap, true);
-    } else {
+    if (hostMemory < requiredHostMemory) {
       throw new SkippedException("Not enough RAM on machine to run. Test skipped!");
     }
+
+    double MaxRAMPercentage = ((double)maxcoopheap / hostMemory) * 100.0;
+    double headroomPercentage = ((double)headroom / hostMemory) * 100.0;
+
+    // Args: MaxRAMPercentage, forcecoop, expectheap, expectcoop
+    checkMaxRAMSize(MaxRAMPercentage - headroomPercentage, false, maxcoopheap - (long)headroom, true);
+    checkMaxRAMSize(MaxRAMPercentage + headroomPercentage, false, maxcoopheap + (long)headroom, false);
+    checkMaxRAMSize(MaxRAMPercentage, true, maxcoopheap, true);
   }
 }