# HG changeset patch
# User ecaspole
# Date 1430335541 14400
# Node ID 37221c0258e02381c44c84aebb19c941ccb9d234
# Parent  c38efb747c8a3948756004ca27dd88aacc0f554f
8078405: Heap decommit failed in TestShrinkAuxiliaryData tests
Summary: Modified test so options in the code are after the options from the environment, so -ExplicitGCInvokesConcurrent is always used.
Reviewed-by: tschatzl, kbarrett

diff -r c38efb747c8a -r 37221c0258e0 hotspot/test/gc/g1/TestShrinkAuxiliaryData.java
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData.java	Wed Apr 29 15:32:05 2015 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData.java	Wed Apr 29 15:25:41 2015 -0400
@@ -76,7 +76,6 @@
         printTestInfo(maxCacheSize);
 
         vmOpts.add("-XX:G1ConcRSLogCacheSize=" + hotCardTableSize);
-        vmOpts.addAll(Arrays.asList(Utils.getTestJavaOpts()));
 
         // for 32 bits ObjectAlignmentInBytes is not a option
         if (Platform.is32bit()) {
@@ -98,7 +97,7 @@
 
     private void performTest(List<String> opts) throws Exception {
         ProcessBuilder pb
-                = ProcessTools.createJavaProcessBuilder(
+                = ProcessTools.createJavaProcessBuilder(true,
                         opts.toArray(new String[opts.size()])
                 );
 
diff -r c38efb747c8a -r 37221c0258e0 hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java	Wed Apr 29 15:32:05 2015 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java	Wed Apr 29 15:25:41 2015 -0400
@@ -23,7 +23,7 @@
 
 /**
  * @test TestShrinkAuxiliaryData05
- * @bug 8038423 8061715
+ * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
diff -r c38efb747c8a -r 37221c0258e0 hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java	Wed Apr 29 15:32:05 2015 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java	Wed Apr 29 15:25:41 2015 -0400
@@ -23,7 +23,7 @@
 
 /**
  * @test TestShrinkAuxiliaryData10
- * @bug 8038423 8061715
+ * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
diff -r c38efb747c8a -r 37221c0258e0 hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java	Wed Apr 29 15:32:05 2015 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java	Wed Apr 29 15:25:41 2015 -0400
@@ -23,7 +23,7 @@
 
 /**
  * @test TestShrinkAuxiliaryData15
- * @bug 8038423 8061715
+ * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
diff -r c38efb747c8a -r 37221c0258e0 hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java	Wed Apr 29 15:32:05 2015 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java	Wed Apr 29 15:25:41 2015 -0400
@@ -23,7 +23,7 @@
 
 /**
  * @test TestShrinkAuxiliaryData20
- * @bug 8038423 8061715
+ * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
diff -r c38efb747c8a -r 37221c0258e0 hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java	Wed Apr 29 15:32:05 2015 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java	Wed Apr 29 15:25:41 2015 -0400
@@ -23,7 +23,7 @@
 
 /**
  * @test TestShrinkAuxiliaryData25
- * @bug 8038423 8061715
+ * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
diff -r c38efb747c8a -r 37221c0258e0 hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java	Wed Apr 29 15:32:05 2015 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java	Wed Apr 29 15:25:41 2015 -0400
@@ -23,7 +23,7 @@
 
 /**
  * @test TestShrinkAuxiliaryData30
- * @bug 8038423 8061715
+ * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"