Mercurial > hg > graal-jvmci-8

diff test/gc/g1/TestShrinkAuxiliaryData.java @ 22981:f967da7f0c3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8062537: [TESTBUG] Conflicting GC combinations in hotspot tests Reviewed-by: tschatzl, jwilhelm
author jwilhelm
date Thu, 23 Apr 2015 15:59:48 +0200
parents 7a6313074325
children e5406a79ae90
line wrap: on
line diff
--- a/test/gc/g1/TestShrinkAuxiliaryData.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkAuxiliaryData.java	Thu Apr 23 15:59:48 2015 +0200
@@ -70,9 +70,7 @@
         printTestInfo(maxCacheSize);
 
         vmOpts.add("-XX:G1ConcRSLogCacheSize=" + RSetCacheSize);
-
-        vmOpts.addAll(Arrays.asList(Utils.getFilteredTestJavaOpts(
-                ShrinkAuxiliaryDataTest.prohibitedVmOptions)));
+        vmOpts.addAll(Arrays.asList(Utils.getTestJavaOpts()));
 
         // for 32 bits ObjectAlignmentInBytes is not a option
         if (Platform.is32bit()) {
@@ -272,16 +270,5 @@
         private static final int REGIONS_TO_ALLOCATE = 5;
         private static final int NUM_OBJECTS_PER_REGION = 10;
         private static final int NUM_LINKS = 20; // how many links create for each object
-
-        private static final String[] prohibitedVmOptions = {
-            // remove this when @requires option will be on duty
-            "-XX:\\+UseParallelGC",
-            "-XX:\\+UseSerialGC",
-            "-XX:\\+UseConcMarkSweepGC",
-            "-XX:\\+UseParallelOldGC",
-            "-XX:\\+UseParNewGC",
-            "-Xconcgc",
-            "-Xincgc"
-        };
     }
 }