# HG changeset patch
# User azakharov
# Date 1415972347 -14400
# Node ID 7a63130743257fafe441c3b9874e87c7c8f2833b
# Parent  b8ca8ec1daea70f7c0d519e866f9f147ec247055
8064716: TestHumongousShrinkHeap.java can not be run with -XX:+ExplicitGCInvokesConcurrent
8062957: Heap is not shrunk when deallocating under memory pressure
Summary: Added explicit -XX:-ExplicitGCInvokesConcurrent to invocations
Reviewed-by: brutisso, tschatzl

diff -r b8ca8ec1daea -r 7a6313074325 test/gc/g1/TestHumongousShrinkHeap.java
--- a/test/gc/g1/TestHumongousShrinkHeap.java	Fri Nov 07 09:22:59 2014 -0800
+++ b/test/gc/g1/TestHumongousShrinkHeap.java	Fri Nov 14 17:39:07 2014 +0400
@@ -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 b8ca8ec1daea -r 7a6313074325 test/gc/g1/TestShrinkAuxiliaryData.java
--- a/test/gc/g1/TestShrinkAuxiliaryData.java	Fri Nov 07 09:22:59 2014 -0800
+++ b/test/gc/g1/TestShrinkAuxiliaryData.java	Fri Nov 14 17:39:07 2014 +0400
@@ -45,6 +45,7 @@
         "-XX:MaxHeapFreeRatio=11",
         "-XX:+UseG1GC",
         "-XX:G1HeapRegionSize=1m",
+        "-XX:-ExplicitGCInvokesConcurrent",
         "-XX:+PrintGCDetails"
     };
 
diff -r b8ca8ec1daea -r 7a6313074325 test/gc/g1/TestShrinkDefragmentedHeap.java
--- a/test/gc/g1/TestShrinkDefragmentedHeap.java	Fri Nov 07 09:22:59 2014 -0800
+++ b/test/gc/g1/TestShrinkDefragmentedHeap.java	Fri Nov 14 17:39:07 2014 +0400
@@ -59,6 +59,7 @@
                 "-XX:MaxHeapFreeRatio=11",
                 "-XX:+UseG1GC",
                 "-XX:G1HeapRegionSize=" + REGION_SIZE,
+                "-XX:-ExplicitGCInvokesConcurrent",
                 "-verbose:gc",
                 GCTest.class.getName()
         );