# HG changeset patch
# User eistepan
# Date 1414670001 -14400
# Node ID 4ec83434ae43a48864b53c364253d66bf4373e2c
# Parent  6d6b54e7cd9b62fa733dc0bdd356906f75a68ea0
8062537: [TESTBUG] Conflicting GC combinations in hotspot tests

diff --git a/test/compiler/regalloc/C1ObjectSpillInLogicOp.java b/test/compiler/regalloc/C1ObjectSpillInLogicOp.java
--- a/test/compiler/regalloc/C1ObjectSpillInLogicOp.java
+++ b/test/compiler/regalloc/C1ObjectSpillInLogicOp.java
@@ -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 --git a/test/gc/6581734/Test6581734.java b/test/gc/6581734/Test6581734.java
--- a/test/gc/6581734/Test6581734.java
+++ b/test/gc/6581734/Test6581734.java
@@ -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 --git a/test/gc/TestSystemGC.java b/test/gc/TestSystemGC.java
--- a/test/gc/TestSystemGC.java
+++ b/test/gc/TestSystemGC.java
@@ -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 --git a/test/gc/arguments/TestAlignmentToUseLargePages.java b/test/gc/arguments/TestAlignmentToUseLargePages.java
--- a/test/gc/arguments/TestAlignmentToUseLargePages.java
+++ b/test/gc/arguments/TestAlignmentToUseLargePages.java
@@ -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 --git a/test/gc/arguments/TestCMSHeapSizeFlags.java b/test/gc/arguments/TestCMSHeapSizeFlags.java
--- a/test/gc/arguments/TestCMSHeapSizeFlags.java
+++ b/test/gc/arguments/TestCMSHeapSizeFlags.java
@@ -25,6 +25,7 @@
  * @test TestCMSHeapSizeFlags
  * @key gc
  * @bug 8006088
+ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @summary Tests argument processing for initial and maximum heap size for the CMS collector
  * @library /testlibrary /testlibrary/whitebox
  * @build TestCMSHeapSizeFlags TestMaxHeapSizeTools
diff --git a/test/gc/arguments/TestG1HeapRegionSize.java b/test/gc/arguments/TestG1HeapRegionSize.java
--- a/test/gc/arguments/TestG1HeapRegionSize.java
+++ b/test/gc/arguments/TestG1HeapRegionSize.java
@@ -25,6 +25,7 @@
  * @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
diff --git a/test/gc/arguments/TestG1HeapSizeFlags.java b/test/gc/arguments/TestG1HeapSizeFlags.java
--- a/test/gc/arguments/TestG1HeapSizeFlags.java
+++ b/test/gc/arguments/TestG1HeapSizeFlags.java
@@ -25,6 +25,7 @@
  * @test TestG1HeapSizeFlags
  * @key gc
  * @bug 8006088
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Tests argument processing for initial and maximum heap size for the G1 collector
  * @library /testlibrary /testlibrary/whitebox
  * @build TestG1HeapSizeFlags TestMaxHeapSizeTools
diff --git a/test/gc/arguments/TestMaxNewSize.java b/test/gc/arguments/TestMaxNewSize.java
--- a/test/gc/arguments/TestMaxNewSize.java
+++ b/test/gc/arguments/TestMaxNewSize.java
@@ -25,6 +25,7 @@
  * @test TestMaxNewSize
  * @key gc
  * @bug 7057939
+ * @requires vm.gc=="null"
  * @summary Make sure that MaxNewSize always has a useful value after argument
  * processing.
  * @library /testlibrary
diff --git a/test/gc/arguments/TestMinInitialErgonomics.java b/test/gc/arguments/TestMinInitialErgonomics.java
--- a/test/gc/arguments/TestMinInitialErgonomics.java
+++ b/test/gc/arguments/TestMinInitialErgonomics.java
@@ -25,6 +25,7 @@
  * @test TestMinInitialErgonomics
  * @key gc
  * @bug 8006088
+ * @requires vm.gc=="Parallel" | vm.gc=="null"
  * @summary Test ergonomics decisions related to minimum and initial heap size.
  * @library /testlibrary /testlibrary/whitebox
  * @build TestMinInitialErgonomics TestMaxHeapSizeTools
diff --git a/test/gc/arguments/TestParallelGCThreads.java b/test/gc/arguments/TestParallelGCThreads.java
--- a/test/gc/arguments/TestParallelGCThreads.java
+++ b/test/gc/arguments/TestParallelGCThreads.java
@@ -25,6 +25,7 @@
  * @test TestParallelGCThreads
  * @key gc
  * @bug 8059527
+ * @requires vm.gc=="null"
  * @summary Tests argument processing for ParallelGCThreads
  * @library /testlibrary
  * @run driver TestParallelGCThreads
diff --git a/test/gc/arguments/TestSerialHeapSizeFlags.java b/test/gc/arguments/TestSerialHeapSizeFlags.java
--- a/test/gc/arguments/TestSerialHeapSizeFlags.java
+++ b/test/gc/arguments/TestSerialHeapSizeFlags.java
@@ -24,6 +24,7 @@
 /*
  * @test TestSerialHeapSizeFlags
  * @key gc
+ * @requires vm.gc=="Serial" | vm.gc=="null"
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the Serial collector
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/arguments/TestUseCompressedOopsErgo.java b/test/gc/arguments/TestUseCompressedOopsErgo.java
--- a/test/gc/arguments/TestUseCompressedOopsErgo.java
+++ b/test/gc/arguments/TestUseCompressedOopsErgo.java
@@ -25,6 +25,7 @@
  * @test TestUseCompressedOopsErgo
  * @key gc
  * @bug 8010722
+ * @requires vm.gc=="null"
  * @summary Tests ergonomics for UseCompressedOops.
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools
diff --git a/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java b/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
--- a/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
+++ b/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
@@ -27,6 +27,7 @@
  * @bug 8049831
  * @library /testlibrary /testlibrary/whitebox
  * @build TestCMSClassUnloadingEnabledHWM
+ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver TestCMSClassUnloadingEnabledHWM
diff --git a/test/gc/class_unloading/TestG1ClassUnloadingHWM.java b/test/gc/class_unloading/TestG1ClassUnloadingHWM.java
--- a/test/gc/class_unloading/TestG1ClassUnloadingHWM.java
+++ b/test/gc/class_unloading/TestG1ClassUnloadingHWM.java
@@ -25,6 +25,7 @@
  * @test
  * @key gc
  * @bug 8049831
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /testlibrary/whitebox
  * @build TestG1ClassUnloadingHWM
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/gc/concurrentMarkSweep/CheckAllocateAndSystemGC.java b/test/gc/concurrentMarkSweep/CheckAllocateAndSystemGC.java
--- a/test/gc/concurrentMarkSweep/CheckAllocateAndSystemGC.java
+++ b/test/gc/concurrentMarkSweep/CheckAllocateAndSystemGC.java
@@ -23,6 +23,7 @@
 
 /**
  * @test CheckAllocateAndSystemGC
+ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @summary CMS: assert(used() == used_after_gc && used_after_gc <= capacity()) failed: used: 0 used_after_gc: 292080 capacity: 1431699456
  * @bug 8013032
  * @key gc
diff --git a/test/gc/concurrentMarkSweep/GuardShrinkWarning.java b/test/gc/concurrentMarkSweep/GuardShrinkWarning.java
--- a/test/gc/concurrentMarkSweep/GuardShrinkWarning.java
+++ b/test/gc/concurrentMarkSweep/GuardShrinkWarning.java
@@ -23,6 +23,7 @@
 
 /**
  * @test GuardShrinkWarning
+ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @summary Remove warning about CMS generation shrinking.
  * @bug 8012111
  * @key gc
diff --git a/test/gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java b/test/gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java
--- a/test/gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java
+++ b/test/gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java
@@ -23,6 +23,7 @@
 
 /**
  * @test SystemGCOnForegroundCollector
+ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @summary CMS: Call reset_after_compaction() only if a compaction has been done
  * @bug 8013184
  * @key gc
diff --git a/test/gc/defnew/HeapChangeLogging.java b/test/gc/defnew/HeapChangeLogging.java
--- a/test/gc/defnew/HeapChangeLogging.java
+++ b/test/gc/defnew/HeapChangeLogging.java
@@ -26,6 +26,7 @@
  * @bug 8027440
  * @library /testlibrary
  * @build HeapChangeLogging
+ * @requires vm.gc=="Serial" | vm.gc=="null"
  * @summary Allocate to get a promotion failure and verify that that heap change logging is present.
  * @run main HeapChangeLogging
  *
@@ -78,4 +79,4 @@
     payload = new byte[payloadSize];
     this.previous = previous;
   }
-}
\ No newline at end of file
+}
diff --git a/test/gc/g1/Test2GbHeap.java b/test/gc/g1/Test2GbHeap.java
--- a/test/gc/g1/Test2GbHeap.java
+++ b/test/gc/g1/Test2GbHeap.java
@@ -24,6 +24,7 @@
 /*
  * @test Test2GbHeap
  * @bug 8031686
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Regression test to ensure we can start G1 with 2gb heap.
  * @key gc
  * @key regression
diff --git a/test/gc/g1/TestEagerReclaimHumongousRegions.java b/test/gc/g1/TestEagerReclaimHumongousRegions.java
--- a/test/gc/g1/TestEagerReclaimHumongousRegions.java
+++ b/test/gc/g1/TestEagerReclaimHumongousRegions.java
@@ -24,6 +24,7 @@
 /*
  * @test TestEagerReclaimHumongousRegions
  * @bug 8027959
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test to make sure that eager reclaim of humongous objects work. We simply try to fill
  * up the heap with humongous objects that should be eagerly reclaimable to avoid Full GC.
  * @key gc
diff --git a/test/gc/g1/TestEagerReclaimHumongousRegions2.java b/test/gc/g1/TestEagerReclaimHumongousRegions2.java
--- a/test/gc/g1/TestEagerReclaimHumongousRegions2.java
+++ b/test/gc/g1/TestEagerReclaimHumongousRegions2.java
@@ -24,6 +24,7 @@
 /*
  * @test TestEagerReclaimHumongousRegions2
  * @bug 8051973
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test to make sure that eager reclaim of humongous objects correctly clears
  * mark bitmaps at reclaim.
  * @key gc
diff --git a/test/gc/g1/TestG1TraceReclaimDeadHumongousObjectsAtYoungGC.java b/test/gc/g1/TestG1TraceReclaimDeadHumongousObjectsAtYoungGC.java
--- a/test/gc/g1/TestG1TraceReclaimDeadHumongousObjectsAtYoungGC.java
+++ b/test/gc/g1/TestG1TraceReclaimDeadHumongousObjectsAtYoungGC.java
@@ -24,6 +24,7 @@
 /*
  * @test TestG1TraceReclaimDeadHumongousObjectsAtYoungGC
  * @bug 8058801
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Ensure that the output for a G1TraceReclaimDeadHumongousObjectsAtYoungGC
  * includes the expected necessary messages.
  * @key gc
diff --git a/test/gc/g1/TestGCLogMessages.java b/test/gc/g1/TestGCLogMessages.java
--- a/test/gc/g1/TestGCLogMessages.java
+++ b/test/gc/g1/TestGCLogMessages.java
@@ -24,6 +24,7 @@
 /*
  * @test TestGCLogMessages
  * @bug 8035406 8027295 8035398 8019342 8027959
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Ensure that the PrintGCDetails output for a minor GC with G1
  * includes the expected necessary messages.
  * @key gc
diff --git a/test/gc/g1/TestHumongousAllocInitialMark.java b/test/gc/g1/TestHumongousAllocInitialMark.java
--- a/test/gc/g1/TestHumongousAllocInitialMark.java
+++ b/test/gc/g1/TestHumongousAllocInitialMark.java
@@ -24,6 +24,7 @@
 /*
  * @test TestHumongousAllocInitialMark
  * @bug 7168848
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary G1: humongous object allocations should initiate marking cycles when necessary
  * @library /testlibrary
  */
diff --git a/test/gc/g1/TestHumongousCodeCacheRoots.java b/test/gc/g1/TestHumongousCodeCacheRoots.java
--- a/test/gc/g1/TestHumongousCodeCacheRoots.java
+++ b/test/gc/g1/TestHumongousCodeCacheRoots.java
@@ -28,6 +28,7 @@
  * @bug 8027756
  * @library /testlibrary /testlibrary/whitebox
  * @build TestHumongousCodeCacheRoots
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @summary Humongous objects may have references from the code cache
diff --git a/test/gc/g1/TestHumongousShrinkHeap.java b/test/gc/g1/TestHumongousShrinkHeap.java
--- a/test/gc/g1/TestHumongousShrinkHeap.java
+++ b/test/gc/g1/TestHumongousShrinkHeap.java
@@ -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
  * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=12 -XX:+UseG1GC -XX:G1HeapRegionSize=1M -verbose:gc TestHumongousShrinkHeap
diff --git a/test/gc/g1/TestPrintGCDetails.java b/test/gc/g1/TestPrintGCDetails.java
--- a/test/gc/g1/TestPrintGCDetails.java
+++ b/test/gc/g1/TestPrintGCDetails.java
@@ -24,6 +24,7 @@
 /*
  * @test TestPrintGCDetails
  * @bug 8010738
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Ensure that the PrintGCDetails for a full GC with G1 includes Metaspace.
  * @key gc
  * @key regression
diff --git a/test/gc/g1/TestPrintRegionRememberedSetInfo.java b/test/gc/g1/TestPrintRegionRememberedSetInfo.java
--- a/test/gc/g1/TestPrintRegionRememberedSetInfo.java
+++ b/test/gc/g1/TestPrintRegionRememberedSetInfo.java
@@ -25,6 +25,7 @@
  * @test TestPrintRegionRememberedSetInfo
  * @key gc
  * @bug 8014240
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test output of G1PrintRegionRememberedSetInfo
  * @library /testlibrary
  * @run main TestPrintRegionRememberedSetInfo
diff --git a/test/gc/g1/TestRegionAlignment.java b/test/gc/g1/TestRegionAlignment.java
--- a/test/gc/g1/TestRegionAlignment.java
+++ b/test/gc/g1/TestRegionAlignment.java
@@ -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 --git a/test/gc/g1/TestShrinkAuxiliaryData.java b/test/gc/g1/TestShrinkAuxiliaryData.java
--- a/test/gc/g1/TestShrinkAuxiliaryData.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData.java
@@ -69,9 +69,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,15 +270,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 --git a/test/gc/g1/TestShrinkAuxiliaryData00.java b/test/gc/g1/TestShrinkAuxiliaryData00.java
--- a/test/gc/g1/TestShrinkAuxiliaryData00.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData00.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkAuxiliaryData00
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/g1/TestShrinkAuxiliaryData05.java b/test/gc/g1/TestShrinkAuxiliaryData05.java
--- a/test/gc/g1/TestShrinkAuxiliaryData05.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData05.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkAuxiliaryData05
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/g1/TestShrinkAuxiliaryData10.java b/test/gc/g1/TestShrinkAuxiliaryData10.java
--- a/test/gc/g1/TestShrinkAuxiliaryData10.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData10.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkAuxiliaryData10
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/g1/TestShrinkAuxiliaryData15.java b/test/gc/g1/TestShrinkAuxiliaryData15.java
--- a/test/gc/g1/TestShrinkAuxiliaryData15.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData15.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkAuxiliaryData15
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/g1/TestShrinkAuxiliaryData20.java b/test/gc/g1/TestShrinkAuxiliaryData20.java
--- a/test/gc/g1/TestShrinkAuxiliaryData20.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData20.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkAuxiliaryData20
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/g1/TestShrinkAuxiliaryData25.java b/test/gc/g1/TestShrinkAuxiliaryData25.java
--- a/test/gc/g1/TestShrinkAuxiliaryData25.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData25.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkAuxiliaryData25
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/g1/TestShrinkAuxiliaryData30.java b/test/gc/g1/TestShrinkAuxiliaryData30.java
--- a/test/gc/g1/TestShrinkAuxiliaryData30.java
+++ b/test/gc/g1/TestShrinkAuxiliaryData30.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkAuxiliaryData30
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @library /testlibrary /testlibrary/whitebox
diff --git a/test/gc/g1/TestShrinkDefragmentedHeap.java b/test/gc/g1/TestShrinkDefragmentedHeap.java
--- a/test/gc/g1/TestShrinkDefragmentedHeap.java
+++ b/test/gc/g1/TestShrinkDefragmentedHeap.java
@@ -24,6 +24,7 @@
 /**
  * @test TestShrinkDefragmentedHeap
  * @bug 8038423
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Verify that heap shrinks after GC in the presence of fragmentation due to humongous objects
  *     1. allocate small objects mixed with humongous ones
  *        "ssssHssssHssssHssssHssssHssssHssssH"
diff --git a/test/gc/g1/TestShrinkToOneRegion.java b/test/gc/g1/TestShrinkToOneRegion.java
--- a/test/gc/g1/TestShrinkToOneRegion.java
+++ b/test/gc/g1/TestShrinkToOneRegion.java
@@ -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 --git a/test/gc/g1/TestStringDeduplicationAgeThreshold.java b/test/gc/g1/TestStringDeduplicationAgeThreshold.java
--- a/test/gc/g1/TestStringDeduplicationAgeThreshold.java
+++ b/test/gc/g1/TestStringDeduplicationAgeThreshold.java
@@ -23,6 +23,7 @@
 
 /*
  * @test TestStringDeduplicationAgeThreshold
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test string deduplication age threshold
  * @bug 8029075
  * @key gc
diff --git a/test/gc/g1/TestStringDeduplicationFullGC.java b/test/gc/g1/TestStringDeduplicationFullGC.java
--- a/test/gc/g1/TestStringDeduplicationFullGC.java
+++ b/test/gc/g1/TestStringDeduplicationFullGC.java
@@ -23,6 +23,7 @@
 
 /*
  * @test TestStringDeduplicationFullGC
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test string deduplication during full GC
  * @bug 8029075
  * @key gc
diff --git a/test/gc/g1/TestStringDeduplicationInterned.java b/test/gc/g1/TestStringDeduplicationInterned.java
--- a/test/gc/g1/TestStringDeduplicationInterned.java
+++ b/test/gc/g1/TestStringDeduplicationInterned.java
@@ -23,6 +23,7 @@
 
 /*
  * @test TestStringDeduplicationInterned
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test string deduplication of interned strings
  * @bug 8029075
  * @key gc
diff --git a/test/gc/g1/TestStringDeduplicationPrintOptions.java b/test/gc/g1/TestStringDeduplicationPrintOptions.java
--- a/test/gc/g1/TestStringDeduplicationPrintOptions.java
+++ b/test/gc/g1/TestStringDeduplicationPrintOptions.java
@@ -23,6 +23,7 @@
 
 /*
  * @test TestStringDeduplicationPrintOptions
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test string deduplication print options
  * @bug 8029075
  * @key gc
diff --git a/test/gc/g1/TestStringDeduplicationTableRehash.java b/test/gc/g1/TestStringDeduplicationTableRehash.java
--- a/test/gc/g1/TestStringDeduplicationTableRehash.java
+++ b/test/gc/g1/TestStringDeduplicationTableRehash.java
@@ -23,6 +23,7 @@
 
 /*
  * @test TestStringDeduplicationTableRehash
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test string deduplication table rehash
  * @bug 8029075
  * @key gc
diff --git a/test/gc/g1/TestStringDeduplicationTableResize.java b/test/gc/g1/TestStringDeduplicationTableResize.java
--- a/test/gc/g1/TestStringDeduplicationTableResize.java
+++ b/test/gc/g1/TestStringDeduplicationTableResize.java
@@ -23,6 +23,7 @@
 
 /*
  * @test TestStringDeduplicationTableResize
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test string deduplication table resize
  * @bug 8029075
  * @key gc
diff --git a/test/gc/g1/TestStringDeduplicationYoungGC.java b/test/gc/g1/TestStringDeduplicationYoungGC.java
--- a/test/gc/g1/TestStringDeduplicationYoungGC.java
+++ b/test/gc/g1/TestStringDeduplicationYoungGC.java
@@ -23,6 +23,7 @@
 
 /*
  * @test TestStringDeduplicationYoungGC
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test string deduplication during young GC
  * @bug 8029075
  * @key gc
diff --git a/test/gc/g1/TestStringSymbolTableStats.java b/test/gc/g1/TestStringSymbolTableStats.java
--- a/test/gc/g1/TestStringSymbolTableStats.java
+++ b/test/gc/g1/TestStringSymbolTableStats.java
@@ -24,6 +24,7 @@
 /*
  * @test TestStringSymbolTableStats.java
  * @bug 8027476 8027455
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Ensure that the G1TraceStringSymbolTableScrubbing prints the expected message.
  * @key gc
  * @library /testlibrary
diff --git a/test/gc/g1/TestSummarizeRSetStats.java b/test/gc/g1/TestSummarizeRSetStats.java
--- a/test/gc/g1/TestSummarizeRSetStats.java
+++ b/test/gc/g1/TestSummarizeRSetStats.java
@@ -26,6 +26,7 @@
  * @bug 8013895
  * @library /testlibrary
  * @build TestSummarizeRSetStatsTools TestSummarizeRSetStats
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Verify output of -XX:+G1SummarizeRSetStats
  * @run main TestSummarizeRSetStats
  *
diff --git a/test/gc/g1/TestSummarizeRSetStatsPerRegion.java b/test/gc/g1/TestSummarizeRSetStatsPerRegion.java
--- a/test/gc/g1/TestSummarizeRSetStatsPerRegion.java
+++ b/test/gc/g1/TestSummarizeRSetStatsPerRegion.java
@@ -26,6 +26,7 @@
  * @bug 8014078
  * @library /testlibrary
  * @build TestSummarizeRSetStatsTools TestSummarizeRSetStatsPerRegion
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Verify output of -XX:+G1SummarizeRSetStats in regards to per-region type output
  * @run main TestSummarizeRSetStatsPerRegion
  */
diff --git a/test/gc/g1/TestSummarizeRSetStatsThreads.java b/test/gc/g1/TestSummarizeRSetStatsThreads.java
--- a/test/gc/g1/TestSummarizeRSetStatsThreads.java
+++ b/test/gc/g1/TestSummarizeRSetStatsThreads.java
@@ -24,6 +24,7 @@
 /*
  * @test TestSummarizeRSetStatsThreads
  * @bug 8025441
+ * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Ensure that various values of worker threads/concurrent
  * refinement threads do not crash the VM.
  * @key gc
diff --git a/test/gc/metaspace/G1AddMetaspaceDependency.java b/test/gc/metaspace/G1AddMetaspaceDependency.java
--- a/test/gc/metaspace/G1AddMetaspaceDependency.java
+++ b/test/gc/metaspace/G1AddMetaspaceDependency.java
@@ -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 --git a/test/gc/metaspace/TestMetaspacePerfCounters.java b/test/gc/metaspace/TestMetaspacePerfCounters.java
--- a/test/gc/metaspace/TestMetaspacePerfCounters.java
+++ b/test/gc/metaspace/TestMetaspacePerfCounters.java
@@ -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 --git a/test/gc/metaspace/TestPerfCountersAndMemoryPools.java b/test/gc/metaspace/TestPerfCountersAndMemoryPools.java
--- a/test/gc/metaspace/TestPerfCountersAndMemoryPools.java
+++ b/test/gc/metaspace/TestPerfCountersAndMemoryPools.java
@@ -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
diff --git a/test/gc/parallelScavenge/AdaptiveGCBoundary.java b/test/gc/parallelScavenge/AdaptiveGCBoundary.java
--- a/test/gc/parallelScavenge/AdaptiveGCBoundary.java
+++ b/test/gc/parallelScavenge/AdaptiveGCBoundary.java
@@ -23,6 +23,7 @@
 
 /**
  * @test AdaptiveGCBoundary
+ * @requires vm.gc=="Parallel" | vm.gc=="null"
  * @summary UseAdaptiveGCBoundary is broken
  * @bug 8014546
  * @key gc
diff --git a/test/gc/parallelScavenge/TestDynShrinkHeap.java b/test/gc/parallelScavenge/TestDynShrinkHeap.java
--- a/test/gc/parallelScavenge/TestDynShrinkHeap.java
+++ b/test/gc/parallelScavenge/TestDynShrinkHeap.java
@@ -25,6 +25,7 @@
  * @ignore 8019361
  * @test TestDynShrinkHeap
  * @bug 8016479
+ * @requires vm.gc=="Parallel" | vm.gc=="null"
  * @summary Verify that the heap shrinks after full GC according to the current values of the Min/MaxHeapFreeRatio flags
  * @library /testlibrary
  * @run main/othervm -XX:+UseAdaptiveSizePolicyWithSystemGC -XX:+UseParallelGC -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 -Xmx1g -verbose:gc TestDynShrinkHeap
diff --git a/test/gc/startup_warnings/TestCMS.java b/test/gc/startup_warnings/TestCMS.java
--- a/test/gc/startup_warnings/TestCMS.java
+++ b/test/gc/startup_warnings/TestCMS.java
@@ -25,6 +25,7 @@
 * @test TestCMS
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
 * @summary Test that CMS does not print a warning message
 * @library /testlibrary
 */
diff --git a/test/gc/startup_warnings/TestCMSIncrementalMode.java b/test/gc/startup_warnings/TestCMSIncrementalMode.java
--- a/test/gc/startup_warnings/TestCMSIncrementalMode.java
+++ b/test/gc/startup_warnings/TestCMSIncrementalMode.java
@@ -26,6 +26,7 @@
 * @test TestCMSIncrementalMode
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
 * @summary Test that the deprecated CMSIncrementalMode print a warning message
 * @library /testlibrary
 */
diff --git a/test/gc/startup_warnings/TestCMSNoIncrementalMode.java b/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
--- a/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
+++ b/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
@@ -25,6 +25,7 @@
 * @test TestCMSNoIncrementalMode
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
 * @summary Test that CMS with incremental mode turned off does not print a warning message
 * @library /testlibrary
 */
diff --git a/test/gc/startup_warnings/TestDefNewCMS.java b/test/gc/startup_warnings/TestDefNewCMS.java
--- a/test/gc/startup_warnings/TestDefNewCMS.java
+++ b/test/gc/startup_warnings/TestDefNewCMS.java
@@ -25,6 +25,7 @@
 * @test TestDefNewCMS
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
 * @summary Test that the deprecated DefNew+CMS combination print a warning message
 * @library /testlibrary
 */
diff --git a/test/gc/startup_warnings/TestG1.java b/test/gc/startup_warnings/TestG1.java
--- a/test/gc/startup_warnings/TestG1.java
+++ b/test/gc/startup_warnings/TestG1.java
@@ -24,6 +24,7 @@
 /*
 * @test TestG1
 * @key gc
+* @requires vm.gc=="G1" | vm.gc=="null"
 * @bug 8006398
 * @summary Test that the G1 collector does not print a warning message
 * @library /testlibrary
diff --git a/test/gc/startup_warnings/TestParNewCMS.java b/test/gc/startup_warnings/TestParNewCMS.java
--- a/test/gc/startup_warnings/TestParNewCMS.java
+++ b/test/gc/startup_warnings/TestParNewCMS.java
@@ -25,6 +25,7 @@
 * @test TestParNewCMS
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
 * @summary Test that the combination ParNew+CMS does not print a warning message
 * @library /testlibrary
 */
diff --git a/test/gc/startup_warnings/TestParallelGC.java b/test/gc/startup_warnings/TestParallelGC.java
--- a/test/gc/startup_warnings/TestParallelGC.java
+++ b/test/gc/startup_warnings/TestParallelGC.java
@@ -25,6 +25,7 @@
 * @test TestParallelGC
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="Parallel" | vm.gc=="null"
 * @summary Test that ParallelGC does not print a warning message
 * @library /testlibrary
 */
diff --git a/test/gc/startup_warnings/TestParallelScavengeSerialOld.java b/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
--- a/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
+++ b/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
@@ -25,6 +25,7 @@
 * @test TestParallelScavengeSerialOld
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="Parallel" | vm.gc=="null"
 * @summary Test that the ParallelScavenge+SerialOld combination does not print a warning message
 * @library /testlibrary
 */
diff --git a/test/gc/startup_warnings/TestSerialGC.java b/test/gc/startup_warnings/TestSerialGC.java
--- a/test/gc/startup_warnings/TestSerialGC.java
+++ b/test/gc/startup_warnings/TestSerialGC.java
@@ -25,6 +25,7 @@
 * @test TestSerialGC
 * @key gc
 * @bug 8006398
+* @requires vm.gc=="Serial" | vm.gc=="null"
 * @summary Test that SerialGC does not print a warning message
 * @library /testlibrary
 */