# HG changeset patch
# User lana
# Date 1415988218 28800
# Node ID eb16b24e2eba9bdf04a9b377bebc2db9f713ff5e
# Parent  75ef834238df1bc6abec0e009f2567a6ad425186# Parent  7a63130743257fafe441c3b9874e87c7c8f2833b
Merge

diff -r 75ef834238df -r eb16b24e2eba test/gc/g1/TestHumongousShrinkHeap.java
--- a/test/gc/g1/TestHumongousShrinkHeap.java	Wed Nov 12 13:47:19 2014 -0800
+++ b/test/gc/g1/TestHumongousShrinkHeap.java	Fri Nov 14 10:03:38 2014 -0800
@@ -24,9 +24,12 @@
 /**
  * @test TestHumongousShrinkHeap
  * @bug 8036025 8056043
- * @summary Verify that heap shrinks after GC in the presence of fragmentation due to humongous objects
+ * @summary Verify that heap shrinks after GC in the presence of fragmentation
+ * due to humongous objects
  * @library /testlibrary
- * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=12 -XX:+UseG1GC -XX:G1HeapRegionSize=1M -verbose:gc TestHumongousShrinkHeap
+ * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:MinHeapFreeRatio=10
+ * -XX:MaxHeapFreeRatio=12 -XX:+UseG1GC -XX:G1HeapRegionSize=1M -verbose:gc
+ * TestHumongousShrinkHeap
  */
 
 import java.lang.management.ManagementFactory;
diff -r 75ef834238df -r eb16b24e2eba test/gc/g1/TestShrinkAuxiliaryData.java
--- a/test/gc/g1/TestShrinkAuxiliaryData.java	Wed Nov 12 13:47:19 2014 -0800
+++ b/test/gc/g1/TestShrinkAuxiliaryData.java	Fri Nov 14 10:03:38 2014 -0800
@@ -45,6 +45,7 @@
         "-XX:MaxHeapFreeRatio=11",
         "-XX:+UseG1GC",
         "-XX:G1HeapRegionSize=1m",
+        "-XX:-ExplicitGCInvokesConcurrent",
         "-XX:+PrintGCDetails"
     };
 
diff -r 75ef834238df -r eb16b24e2eba test/gc/g1/TestShrinkDefragmentedHeap.java
--- a/test/gc/g1/TestShrinkDefragmentedHeap.java	Wed Nov 12 13:47:19 2014 -0800
+++ b/test/gc/g1/TestShrinkDefragmentedHeap.java	Fri Nov 14 10:03:38 2014 -0800
@@ -59,6 +59,7 @@
                 "-XX:MaxHeapFreeRatio=11",
                 "-XX:+UseG1GC",
                 "-XX:G1HeapRegionSize=" + REGION_SIZE,
+                "-XX:-ExplicitGCInvokesConcurrent",
                 "-verbose:gc",
                 GCTest.class.getName()
         );