From be690fa6924603b623e584d61603e1e05c91d730 Mon Sep 17 00:00:00 2001
From: azakharov <unknown>
Date: Fri, 14 Nov 2014 17:39:07 +0400
Subject: [PATCH] 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

---
 test/gc/g1/TestHumongousShrinkHeap.java    | 7 +++++--
 test/gc/g1/TestShrinkAuxiliaryData.java    | 1 +
 test/gc/g1/TestShrinkDefragmentedHeap.java | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/gc/g1/TestHumongousShrinkHeap.java b/test/gc/g1/TestHumongousShrinkHeap.java
index 97d60546b..b350bcd86 100644
--- a/test/gc/g1/TestHumongousShrinkHeap.java
+++ b/test/gc/g1/TestHumongousShrinkHeap.java
@@ -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 --git a/test/gc/g1/TestShrinkAuxiliaryData.java b/test/gc/g1/TestShrinkAuxiliaryData.java
index a185fe5d4..cba813882 100644
--- a/test/gc/g1/TestShrinkAuxiliaryData.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData.java
@@ -45,6 +45,7 @@ public class TestShrinkAuxiliaryData {
         "-XX:MaxHeapFreeRatio=11",
         "-XX:+UseG1GC",
         "-XX:G1HeapRegionSize=1m",
+        "-XX:-ExplicitGCInvokesConcurrent",
         "-XX:+PrintGCDetails"
     };
 
diff --git a/test/gc/g1/TestShrinkDefragmentedHeap.java b/test/gc/g1/TestShrinkDefragmentedHeap.java
index 94eb690e9..c23c8721a 100644
--- a/test/gc/g1/TestShrinkDefragmentedHeap.java
+++ b/test/gc/g1/TestShrinkDefragmentedHeap.java
@@ -59,6 +59,7 @@ public class TestShrinkDefragmentedHeap {
                 "-XX:MaxHeapFreeRatio=11",
                 "-XX:+UseG1GC",
                 "-XX:G1HeapRegionSize=" + REGION_SIZE,
+                "-XX:-ExplicitGCInvokesConcurrent",
                 "-verbose:gc",
                 GCTest.class.getName()
         );
-- 
GitLab