test/gc/g1/TestShrinkAuxiliaryData.java

rev 7249 : 8062537: [TESTBUG] Conflicting GC combinations in hotspot tests

*** 67,79 ****
          }
  
          printTestInfo(maxCacheSize);
  
          vmOpts.add("-XX:G1ConcRSLogCacheSize=" + RSetCacheSize);
! 
!         vmOpts.addAll(Arrays.asList(Utils.getFilteredTestJavaOpts(
!                 ShrinkAuxiliaryDataTest.prohibitedVmOptions)));
  
          // for 32 bits ObjectAlignmentInBytes is not a option
          if (Platform.is32bit()) {
              ArrayList<String> vmOptsWithoutAlign = new ArrayList(vmOpts);
              vmOptsWithoutAlign.add(ShrinkAuxiliaryDataTest.class.getName());
--- 67,77 ----
          }
  
          printTestInfo(maxCacheSize);
  
          vmOpts.add("-XX:G1ConcRSLogCacheSize=" + RSetCacheSize);
!         vmOpts.addAll(Arrays.asList(Utils.getTestJavaOpts()));
  
          // for 32 bits ObjectAlignmentInBytes is not a option
          if (Platform.is32bit()) {
              ArrayList<String> vmOptsWithoutAlign = new ArrayList(vmOpts);
              vmOptsWithoutAlign.add(ShrinkAuxiliaryDataTest.class.getName());
*** 270,286 ****
          private static final int DEFAULT_ITERATION_COUNT = 1;   // iterate main scenario
          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"
-         };
      }
  }
--- 268,274 ----