Mercurial > hg > truffle
changeset 20624:eb16b24e2eba jdk8u40-b15
Merge
| author | lana |
|---|---|
| date | Fri, 14 Nov 2014 10:03:38 -0800 |
| parents | 75ef834238df (current diff) 7a6313074325 (diff) |
| children | 767511982e47 fb6a855141cb |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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" };
--- 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() );