8078405: Heap decommit failed in TestShrinkAuxiliaryData tests

Modified test so options in the code are after the options from the environment, so -ExplicitGCInvokesConcurrent is always used.

Reviewed-by: tschatzl, kbarrett
This commit is contained in:
Eric Caspole 2015-04-29 15:25:41 -04:00
parent f10e4ec0a6
commit c120339bf0
7 changed files with 7 additions and 8 deletions

View File

@ -76,7 +76,6 @@ public class TestShrinkAuxiliaryData {
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 @@ public class TestShrinkAuxiliaryData {
private void performTest(List<String> opts) throws Exception {
ProcessBuilder pb
= ProcessTools.createJavaProcessBuilder(
= ProcessTools.createJavaProcessBuilder(true,
opts.toArray(new String[opts.size()])
);

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"