# HG changeset patch
# User jwilhelm
# Date 1429797588 -7200
# Node ID f967da7f0c3c256f35ddbab56a7dee57ea5147d2
# Parent  974d7f3df72657d15bf340fb3c296ee8191f4be2
8062537: [TESTBUG] Conflicting GC combinations in hotspot tests
Reviewed-by: tschatzl, jwilhelm

diff -r 974d7f3df726 -r f967da7f0c3c test/compiler/regalloc/C1ObjectSpillInLogicOp.java
--- a/test/compiler/regalloc/C1ObjectSpillInLogicOp.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/compiler/regalloc/C1ObjectSpillInLogicOp.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8027751
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary C1 crashes generating G1 post-barrier in Unsafe.getAndSetObject() intrinsic because of the new value spill
  * @run main/othervm -XX:+UseG1GC C1ObjectSpillInLogicOp
  *
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/6581734/Test6581734.java
--- a/test/gc/6581734/Test6581734.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/6581734/Test6581734.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test Test6581734.java
  * @bug 6581734
+ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @summary CMS Old Gen's collection usage is zero after GC which is incorrect
  * @run main/othervm -Xmx512m -verbose:gc -XX:+UseConcMarkSweepGC Test6581734
  *
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/TestSystemGC.java
--- a/test/gc/TestSystemGC.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/TestSystemGC.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test TestSystemGC
  * @key gc
+ * @requires vm.gc=="null"
  * @summary Runs System.gc() with different flags.
  * @run main/othervm TestSystemGC
  * @run main/othervm -XX:+UseSerialGC TestSystemGC
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/arguments/TestAlignmentToUseLargePages.java
--- a/test/gc/arguments/TestAlignmentToUseLargePages.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/arguments/TestAlignmentToUseLargePages.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug 8024396
  * @key gc
  * @key regression
+ * @requires vm.gc=="null"
  * @run main/othervm -Xms7M -Xmx9M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:+UseLargePages TestAlignmentToUseLargePages
  * @run main/othervm -Xms7M -Xmx9M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:-UseLargePages TestAlignmentToUseLargePages
  * @run main/othervm -Xms7M -Xmx9M -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseLargePages TestAlignmentToUseLargePages
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/arguments/TestG1HeapRegionSize.java
--- a/test/gc/arguments/TestG1HeapRegionSize.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/arguments/TestG1HeapRegionSize.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,12 @@
  * @test TestG1HeapRegionSize
  * @key gc
  * @bug 8021879
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Verify that the flag G1HeapRegionSize is updated properly
  * @run main/othervm -Xmx64m TestG1HeapRegionSize 1048576
- * @run main/othervm -XX:G1HeapRegionSize=2m -Xmx64m TestG1HeapRegionSize 2097152
- * @run main/othervm -XX:G1HeapRegionSize=3m -Xmx64m TestG1HeapRegionSize 2097152
- * @run main/othervm -XX:G1HeapRegionSize=64m -Xmx256m TestG1HeapRegionSize 33554432
+ * @run main/othervm -XX:G1HeapRegionSize=2m -Xmx64m -XX:+UseG1GC TestG1HeapRegionSize 2097152
+ * @run main/othervm -XX:G1HeapRegionSize=3m -Xmx64m -XX:+UseG1GC TestG1HeapRegionSize 2097152
+ * @run main/othervm -XX:G1HeapRegionSize=64m -Xmx256m -XX:+UseG1GC TestG1HeapRegionSize 33554432
  */
 
 import sun.management.ManagementFactoryHelper;
@@ -41,14 +42,8 @@
   public static void main(String[] args) {
     HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
 
-    VMOption option = diagnostic.getVMOption("UseG1GC");
-    if (option.getValue().equals("false")) {
-      System.out.println("Skipping this test. It is only a G1 test.");
-      return;
-    }
-
     String expectedValue = getExpectedValue(args);
-    option = diagnostic.getVMOption("G1HeapRegionSize");
+    VMOption option = diagnostic.getVMOption("G1HeapRegionSize");
     if (!expectedValue.equals(option.getValue())) {
       throw new RuntimeException("Wrong value for G1HeapRegionSize. Expected " + expectedValue + " but got " + option.getValue());
     }
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/concurrentMarkSweep/DisableResizePLAB.java
--- a/test/gc/concurrentMarkSweep/DisableResizePLAB.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/concurrentMarkSweep/DisableResizePLAB.java	Thu Apr 23 15:59:48 2015 +0200
@@ -26,6 +26,7 @@
  * @key gc
  * @bug 8060467
  * @author filipp.zhinkin@oracle.com, john.coomes@oracle.com
+ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @summary Run CMS with PLAB resizing disabled and a small OldPLABSize
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:-ResizePLAB -XX:OldPLABSize=1k -Xmx256m -XX:+PrintGCDetails DisableResizePLAB
  */
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestHumongousShrinkHeap.java
--- a/test/gc/g1/TestHumongousShrinkHeap.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestHumongousShrinkHeap.java	Thu Apr 23 15:59:48 2015 +0200
@@ -24,6 +24,7 @@
 /**
  * @test TestHumongousShrinkHeap
  * @bug 8036025 8056043
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Verify that heap shrinks after GC in the presence of fragmentation
  * due to humongous objects
  * @library /testlibrary
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestRegionAlignment.java
--- a/test/gc/g1/TestRegionAlignment.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestRegionAlignment.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test TestRegionAlignment.java
  * @bug 8013791
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Make sure that G1 ergonomics pick a heap size that is aligned with the region size
  * @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -XX:MaxRAM=555m TestRegionAlignment
  *
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkAuxiliaryData.java
--- 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"
-        };
     }
 }
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkAuxiliaryData05.java
--- a/test/gc/g1/TestShrinkAuxiliaryData05.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkAuxiliaryData05.java	Thu Apr 23 15:59:48 2015 +0200
@@ -26,6 +26,7 @@
  * @bug 8038423
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /testlibrary/whitebox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData05
  * @run driver/timeout=720 TestShrinkAuxiliaryData05
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkAuxiliaryData10.java
--- a/test/gc/g1/TestShrinkAuxiliaryData10.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkAuxiliaryData10.java	Thu Apr 23 15:59:48 2015 +0200
@@ -26,6 +26,7 @@
  * @bug 8038423
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /testlibrary/whitebox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData10
  * @run driver/timeout=720 TestShrinkAuxiliaryData10
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkAuxiliaryData15.java
--- a/test/gc/g1/TestShrinkAuxiliaryData15.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkAuxiliaryData15.java	Thu Apr 23 15:59:48 2015 +0200
@@ -26,6 +26,7 @@
  * @bug 8038423
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /testlibrary/whitebox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData15
  * @run driver/timeout=720 TestShrinkAuxiliaryData15
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkAuxiliaryData20.java
--- a/test/gc/g1/TestShrinkAuxiliaryData20.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkAuxiliaryData20.java	Thu Apr 23 15:59:48 2015 +0200
@@ -26,6 +26,7 @@
  * @bug 8038423
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /testlibrary/whitebox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData20
  * @run driver/timeout=720 TestShrinkAuxiliaryData20
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkAuxiliaryData25.java
--- a/test/gc/g1/TestShrinkAuxiliaryData25.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkAuxiliaryData25.java	Thu Apr 23 15:59:48 2015 +0200
@@ -26,6 +26,7 @@
  * @bug 8038423
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /testlibrary/whitebox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData25
  * @run driver/timeout=720 TestShrinkAuxiliaryData25
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkAuxiliaryData30.java
--- a/test/gc/g1/TestShrinkAuxiliaryData30.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkAuxiliaryData30.java	Thu Apr 23 15:59:48 2015 +0200
@@ -26,6 +26,7 @@
  * @bug 8038423
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /testlibrary/whitebox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData30
  * @run driver/timeout=720 TestShrinkAuxiliaryData30
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/g1/TestShrinkToOneRegion.java
--- a/test/gc/g1/TestShrinkToOneRegion.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/g1/TestShrinkToOneRegion.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test TestShrinkToOneRegion.java
  * @bug 8013872
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Shrinking the heap down to one region used to hit an assert
  * @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -Xmx256m TestShrinkToOneRegion
  *
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/metaspace/G1AddMetaspaceDependency.java
--- a/test/gc/metaspace/G1AddMetaspaceDependency.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/metaspace/G1AddMetaspaceDependency.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test G1AddMetaspaceDependency
  * @bug 8010196
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that we don't get locking problems when adding metaspace dependencies with the G1 update buffer monitor
  * @run main/othervm -XX:+UseG1GC -XX:G1UpdateBufferSize=1 G1AddMetaspaceDependency
  */
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/metaspace/TestMetaspacePerfCounters.java
--- a/test/gc/metaspace/TestMetaspacePerfCounters.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/metaspace/TestMetaspacePerfCounters.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 
 /* @test TestMetaspacePerfCounters
  * @bug 8014659
+ * @requires vm.gc=="null"
  * @library /testlibrary
  * @summary Tests that performance counters for metaspace and compressed class
  *          space exists and works.
diff -r 974d7f3df726 -r f967da7f0c3c test/gc/metaspace/TestPerfCountersAndMemoryPools.java
--- a/test/gc/metaspace/TestPerfCountersAndMemoryPools.java	Wed Apr 22 05:05:49 2015 -0700
+++ b/test/gc/metaspace/TestPerfCountersAndMemoryPools.java	Thu Apr 23 15:59:48 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 /* @test TestPerfCountersAndMemoryPools
  * @bug 8023476
  * @library /testlibrary
+ * @requires vm.gc=="Serial" | vm.gc=="null"
  * @summary Tests that a MemoryPoolMXBeans and PerfCounters for metaspace
  *          report the same data.
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedKlassPointers -XX:+UseSerialGC -XX:+UsePerfData -Xint TestPerfCountersAndMemoryPools