--- a/hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 +24,7 @@
 /*
  * @test
  * @bug 8027751
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary C1 crashes generating G1 post-barrier in Unsafe.getAndSetObject() intrinsic because of the new value spill
  * @run main/othervm -XX:+UseG1GC C1ObjectSpillInLogicOp
  *

--- a/hotspot/test/gc/TestCardTablePageCommits.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/TestCardTablePageCommits.java	Fri Jun 24 19:52:31 2016 +0400
@@ -31,7 +31,7 @@
  * @key gc
  * @bug 8059066
  * @summary Tests that the card table does not commit the same page twice
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestCMSHeapSizeFlags
  * @key gc
  * @bug 8006088
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary Tests argument processing for initial and maximum heap size for the CMS collector
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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,7 +24,7 @@
 /*
  * @test TestG1ConcMarkStepDurationMillis
  * @key gc
- * @requires vm.gc=="null" | vm.gc=="G1"
+ * @requires vm.gc.G1
  * @summary Tests argument processing for double type flag, G1ConcMarkStepDurationMillis
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestG1ConcRefinementThreads
  * @key gc
  * @bug 8047976
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Tests argument processing for G1ConcRefinementThreads
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/arguments/TestG1HeapRegionSize.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestG1HeapRegionSize.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,7 +25,7 @@
  * @test TestG1HeapRegionSize
  * @key gc
  * @bug 8021879
- * @requires vm.gc=="null" | vm.gc=="G1"
+ * @requires vm.gc.G1
  * @summary Verify that the flag G1HeapRegionSize is updated properly
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management

--- a/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestG1HeapSizeFlags
  * @key gc
  * @bug 8006088
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Tests argument processing for initial and maximum heap size for the G1 collector
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/arguments/TestG1PercentageOptions.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestG1PercentageOptions.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestG1PercentageOptions
  * @key gc
  * @bug 8068942
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Test argument processing of various percentage options
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestInitialTenuringThreshold
  * @key gc
  * @bug 8014765
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @summary Tests argument processing for initial tenuring threshold
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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
@@ -27,7 +27,7 @@
  * @bug 8144527
  * @summary Tests argument processing for NewSizeThreadIncrease
  * @library /testlibrary
- * @requires vm.gc=="Serial" | vm.gc=="null"
+ * @requires vm.gc.Serial
  * @modules java.base/jdk.internal.misc
  *          java.management
  */

--- a/hotspot/test/gc/arguments/TestObjectTenuringFlags.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/arguments/TestObjectTenuringFlags.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestObjectTenuringFlags
  * @key gc
  * @bug 6521376
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @summary Tests argument processing for NeverTenure, AlwaysTenure,
  * and MaxTenuringThreshold
  * @library /testlibrary

--- a/hotspot/test/gc/cms/DisableResizePLAB.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/cms/DisableResizePLAB.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, 2016, 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
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8060467
  * @author filipp.zhinkin@oracle.com, john.coomes@oracle.com
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary Run CMS with PLAB resizing disabled and a small OldPLABSize
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:-ResizePLAB -XX:OldPLABSize=1k -Xmx256m -Xlog:gc=debug DisableResizePLAB
  */

--- a/hotspot/test/gc/cms/TestBubbleUpRef.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/cms/TestBubbleUpRef.java	Fri Jun 24 19:52:31 2016 +0400
@@ -28,7 +28,7 @@
 
 /*
  * @test
- * @requires vm.gc=="ConcMarkSweep" | vm.gc == "null"
+ * @requires vm.gc.ConcMarkSweep
  * @key cte_test
  * @bug 4950157
  * @summary Stress the behavior of ergonomics when the heap is nearly full and

--- a/hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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,7 +25,7 @@
  * @test TestCMSScavengeBeforeRemark
  * @key gc
  * @bug 8139868
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary Run CMS with CMSScavengeBeforeRemark
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+CMSScavengeBeforeRemark -XX:+ExplicitGCInvokesConcurrent -Xmx256m -Xlog:gc=debug TestCMSScavengeBeforeRemark
  */

--- a/hotspot/test/gc/cms/TestMBeanCMS.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/cms/TestMBeanCMS.java	Fri Jun 24 19:52:31 2016 +0400
@@ -24,7 +24,7 @@
 /*
  * @test TestMBeanCMS.java
  * @bug 6581734
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary CMS Old Gen's collection usage is zero after GC which is incorrect
  * @modules java.management
  * @run main/othervm -Xmx512m -verbose:gc -XX:+UseConcMarkSweepGC TestMBeanCMS

--- a/hotspot/test/gc/g1/Test2GbHeap.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/Test2GbHeap.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @bug 8031686
  * @summary Regression test to ensure we can start G1 with 2gb heap.
  * Skip test on 32 bit system: it typically does not support the many and large virtual memory reservations needed.
- * @requires (vm.gc == "G1" | vm.gc == "null")
+ * @requires vm.gc.G1
  * @requires vm.bits != "32"
  * @key gc
  * @key regression

--- a/hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java	Fri Jun 24 19:52:31 2016 +0400
@@ -24,7 +24,7 @@
 /*
  * @test TestGreyReclaimedHumongousObjects.java
  * @bug 8069367
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @summary Test handling of marked but unscanned reclaimed humongous objects.
  * @key gc
  * @modules jdk.management

--- a/hotspot/test/gc/g1/TestHumongousShrinkHeap.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestHumongousShrinkHeap.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
 /**
  * @test TestHumongousShrinkHeap
  * @bug 8036025 8056043
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Verify that heap shrinks after GC in the presence of fragmentation
  * due to humongous objects
  * @library /testlibrary

--- a/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +28,7 @@
  * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
- * @requires (vm.gc=="G1" | vm.gc=="null")
+ * @requires vm.gc.G1
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestLargePageUseForAuxMemory
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -27,7 +27,7 @@
  * @summary Test to check that a live humongous object is not eagerly reclaimed. This is a regression test for
  *          8139424 and the test will crash if an eager reclaim occur. The test is not 100% deterministic and
  *          might pass even if there are problems in the code, but it will never crash unless there is a problem.
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @key gc
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestPLABOutput.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestPLABOutput.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestPLABOutput
  * @bug 8140585
  * @summary Check that G1 does not report empty PLAB statistics in the first evacuation.
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib

--- a/hotspot/test/gc/g1/TestPLABSizeBounds.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestPLABSizeBounds.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +25,7 @@
  * @test TestPLABSizeBounds
  * @bug 8134857
  * @summary Regression test to ensure that G1 supports PLAB sizes of half a region size.
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @key gc
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestRegionAlignment.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestRegionAlignment.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 +24,7 @@
 /*
  * @test TestRegionAlignment.java
  * @bug 8013791
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @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
  *

--- a/hotspot/test/gc/g1/TestRegionLivenessPrint.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestRegionLivenessPrint.java	Fri Jun 24 19:52:31 2016 +0400
@@ -24,7 +24,7 @@
 /*
  * @test TestRegionLivenessPrint.java
  * @bug 8151920
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Make sure that G1 does not assert when printing region liveness data on a humongous continues region.
  * @key gc
  * @library /testlibrary /test/lib

--- a/hotspot/test/gc/g1/TestRemsetLogging.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestRemsetLogging.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test TestRemsetLogging.java
- * @requires vm.gc=="G1" | vm.gc =="null"
+ * @requires vm.gc.G1
  * @bug 8013895 8129977 8145534
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test TestRemsetLoggingPerRegion.java
- * @requires vm.gc=="G1" | vm.gc =="null"
+ * @requires vm.gc.G1
  * @bug 8014078 8129977 8145534
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestRemsetLoggingThreads.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestRemsetLoggingThreads.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test TestRemsetLoggingThreads
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @bug 8025441 8145534
  * @key gc
  * @library /testlibrary

--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @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"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @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"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @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"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @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"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @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"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @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"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/TestShrinkToOneRegion.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/TestShrinkToOneRegion.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 +24,7 @@
 /*
  * @test TestShrinkToOneRegion.java
  * @bug 8013872
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Shrinking the heap down to one region used to hit an assert
  * @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -Xmx256m TestShrinkToOneRegion
  *

--- a/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java	Fri Jun 24 19:52:31 2016 +0400
@@ -37,7 +37,7 @@
 /**
  * @test TestHeapCounters
  * @summary Checks that heap counters work as expected after humongous allocations/deallocations
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java	Fri Jun 24 19:52:31 2016 +0400
@@ -38,7 +38,7 @@
 /**
  * @test gc.g1.humongousObjects.TestHumongousClassLoader
  * @summary Checks that unreachable classes and unreachable humongous class loader are unloaded after GC
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M"
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /testlibrary /test/lib /

--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -39,7 +39,7 @@
 /**
  * @test TestHumongousMovement
  * @summary Checks that Humongous objects are not moved during GC
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -37,7 +37,7 @@
 /**
  * @test gc.g1.humongousObjects.TestHumongousNonArrayAllocation
  * @summary Checks that huge class' instances (ie with huge amount of fields) are allocated successfully
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M"
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java	Fri Jun 24 19:52:31 2016 +0400
@@ -31,7 +31,7 @@
 /**
  * @test TestHumongousThreshold
  * @summary Checks that objects larger than half a region are allocated as humongous
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

--- a/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -37,7 +37,7 @@
  * @test TestObjectCollected
  * @summary checks that after different type of GCs weak/soft references to humongous object behave correspondingly to
  * actual object behavior
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

--- a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java	Fri Jun 24 19:52:31 2016 +0400
@@ -48,7 +48,7 @@
 /**
  * @test TestObjectGraphAfterGC
  * @summary Checks that objects' graph behave as expected after gc
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /testlibrary /test/lib /
  * @modules java.management java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/ihop/TestIHOPErgo.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/ihop/TestIHOPErgo.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestIHOPErgo
  * @bug 8148397
  * @summary Test checks that behavior of Adaptive and Static IHOP at concurrent cycle initiation
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.MaxGCPauseMillis == "null"

--- a/hotspot/test/gc/g1/ihop/TestIHOPStatic.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/ihop/TestIHOPStatic.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestIHOPStatic
  * @bug 8148397
  * @summary Test checks concurrent cycle initiation which depends on IHOP value.
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /testlibrary /

--- a/hotspot/test/gc/g1/mixedgc/TestLogging.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/mixedgc/TestLogging.java	Fri Jun 24 19:52:31 2016 +0400
@@ -24,7 +24,7 @@
 /*
  * @test TestLogging
  * @summary Check that a mixed GC is reflected in the gc logs
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.MaxGCPauseMillis == "null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestPLABEvacuationFailure
  * @bug 8148376
  * @summary Checks PLAB statistics on evacuation failure
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

--- a/hotspot/test/gc/g1/plab/TestPLABPromotion.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/plab/TestPLABPromotion.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestPLABPromotion
  * @bug 8141278 8141141
  * @summary Test PLAB promotion
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/g1/plab/TestPLABResize.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/g1/plab/TestPLABResize.java	Fri Jun 24 19:52:31 2016 +0400
@@ -25,7 +25,7 @@
  * @test TestPLABResize
  * @bug 8141278 8141141
  * @summary Test for PLAB resizing
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 +24,7 @@
 /*
  * @test G1AddMetaspaceDependency
  * @bug 8010196
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @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
  */

--- a/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 +30,7 @@
 /* @test TestPerfCountersAndMemoryPools
  * @bug 8023476
  * @library /testlibrary
- * @requires vm.gc=="Serial" | vm.gc=="null"
+ * @requires vm.gc.Serial
  * @summary Tests that a MemoryPoolMXBeans and PerfCounters for metaspace
  *          report the same data.
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/gc/parallel/TestDynShrinkHeap.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/parallel/TestDynShrinkHeap.java	Fri Jun 24 19:52:31 2016 +0400
@@ -24,7 +24,7 @@
 /**
  * @test TestDynShrinkHeap
  * @bug 8016479
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @summary Verify that the heap shrinks after full GC according to the current values of the Min/MaxHeapFreeRatio flags
  * @modules java.base/jdk.internal.misc
  * @modules jdk.management

--- a/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @bug 8016740
  * @summary Tests that jvm with maximally verbose GC logging does not crash when ParOldGC has no memory
  * @key gc
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xmx50m -XX:+UseParallelGC -Xlog:gc*=trace TestPrintGCDetailsVerbose

--- a/hotspot/test/gc/stress/TestMultiThreadStressRSet.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/stress/TestMultiThreadStressRSet.java	Fri Jun 24 19:52:31 2016 +0400
@@ -31,7 +31,7 @@
 /*
  * @test TestMultiThreadStressRSet.java
  * @key stress
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires os.maxMemory > 2G
  * @requires vm.opt.MaxGCPauseMillis == "null"
  *

--- a/hotspot/test/gc/stress/TestStressG1Humongous.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/stress/TestStressG1Humongous.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @key gc
  * @key stress
  * @summary Stress G1 by humongous allocations in situation near OOM
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @run main/othervm/timeout=200 -Xlog:gc=debug -Xmx1g -XX:+UseG1GC -XX:G1HeapRegionSize=4m
  *              -Dtimeout=120 -Dthreads=3 -Dhumongoussize=1.1 -Dregionsize=4 TestStressG1Humongous

--- a/hotspot/test/gc/stress/TestStressIHOPMultiThread.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/stress/TestStressIHOPMultiThread.java	Fri Jun 24 19:52:31 2016 +0400
@@ -26,7 +26,7 @@
  * @bug 8148397
  * @key stress
  * @summary Stress test for IHOP
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @run main/othervm/timeout=200 -Xmx128m -XX:G1HeapWastePercent=0 -XX:G1MixedGCCountTarget=1
  *              -XX:+UseG1GC -XX:G1HeapRegionSize=1m -XX:+G1UseAdaptiveIHOP
  *              -Xlog:gc+ihop=debug,gc+ihop+ergo=debug,gc+ergo=debug:TestStressIHOPMultiThread1.log

--- a/hotspot/test/gc/stress/TestStressRSetCoarsening.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/stress/TestStressRSetCoarsening.java	Fri Jun 24 19:52:31 2016 +0400
@@ -28,7 +28,7 @@
  * @test TestStressRSetCoarsening.java
  * @key stress
  * @bug 8146984 8147087
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires os.maxMemory > 3G
  * @requires vm.opt.MaxGCPauseMillis == "null"
  *

--- a/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
 /*
  * @test TestConMarkCycleWB
  * @bug 8065579
- * @requires vm.gc=="null" | vm.gc=="G1"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.compiler

--- a/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java	Fri Jun 24 19:52:31 2016 +0400
@@ -28,7 +28,7 @@
  * Feature support: G1GC only, compressed oops/kptrs, 64-bit os, not on windows
  * @requires (sun.arch.data.model != "32") & (os.family != "windows")
  * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
- * @requires (vm.gc=="G1" | vm.gc=="null")
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java	Tue Jun 21 18:37:04 2016 +0400
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java	Fri Jun 24 19:52:31 2016 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -27,7 +27,7 @@
  * Feature support: G1GC only, compressed oops/kptrs, 64-bit os, not on windows
  * @requires (sun.arch.data.model != "32") & (os.family != "windows")
  * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
- * @requires (vm.gc=="G1" | vm.gc=="null")
+ * @requires vm.gc.G1
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
  *          java.management