--- old/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java 2014-11-06 18:29:34.564380390 +0400 +++ new/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java 2014-11-06 18:29:34.392380386 +0400 @@ -26,6 +26,7 @@ * @bug 8028994 * @author Staffan Larsen * @library /lib/testlibrary + * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null" * @build jdk.testlibrary.* * @run main CheckOrigin */ --- old/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh 2014-11-06 18:29:34.976380399 +0400 +++ new/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh 2014-11-06 18:29:34.800380395 +0400 @@ -25,7 +25,7 @@ # @test # @bug 4982128 # @summary Test low memory detection of non-heap memory pool -# +# @requires vm.gc=="null" # @run build LowMemoryTest2 MemoryUtil # @run shell/timeout=600 LowMemoryTest2.sh # --- old/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh 2014-11-06 18:29:35.384380408 +0400 +++ new/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh 2014-11-06 18:29:35.200380404 +0400 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary Run MemoryManagement test with concurrent mark sweep GC # @author Mandy Chung -# +# @requires vm.gc=="ConcMarkSweep" | vm.gc=="null" # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementConcMarkSweepGC.sh # --- old/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh 2014-11-06 18:29:35.796380417 +0400 +++ new/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh 2014-11-06 18:29:35.620380413 +0400 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary Run MemoryManagement test with parallel GC # @author Mandy Chung -# +# @requires vm.gc=="Parallel" | vm.gc=="null" # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementParallelGC.sh # --- old/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh 2014-11-06 18:29:36.196380426 +0400 +++ new/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh 2014-11-06 18:29:36.016380422 +0400 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary Run MemoryManagement test with serial GC # @author Mandy Chung -# +# @requires vm.gc=="Serial" | vm.gc=="null" # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementSerialGC.sh # --- old/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh 2014-11-06 18:29:36.600380434 +0400 +++ new/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh 2014-11-06 18:29:36.420380430 +0400 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary # @author Mandy Chung -# +# @requires vm.gc=="Parallel" | vm.gc=="null" # @run compile MemoryTest.java # @run shell MemoryTestAllGC.sh # --- old/test/java/lang/management/MemoryMXBean/PendingAllGC.sh 2014-11-06 18:29:37.000380443 +0400 +++ new/test/java/lang/management/MemoryMXBean/PendingAllGC.sh 2014-11-06 18:29:36.820380439 +0400 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary # @author Mandy Chung -# +# @requires vm.gc=="null" # @run compile Pending.java # @run shell PendingAllGC.sh # --- old/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh 2014-11-06 18:29:37.412380452 +0400 +++ new/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh 2014-11-06 18:29:37.228380448 +0400 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary # @author Mandy Chung -# +# @requires vm.gc=="Parallel" | vm.gc=="null" # @run compile InputArgument.java # @run shell TestInputArgument.sh # --- old/test/java/lang/ref/EnqueuePollRace.java 2014-11-06 18:29:37.828380461 +0400 +++ new/test/java/lang/ref/EnqueuePollRace.java 2014-11-06 18:29:37.644380457 +0400 @@ -25,6 +25,7 @@ * @bug 8014890 * @summary Verify that a race between ReferenceQueue.enqueue() and poll() does not occur. * @author thomas.schatzl@oracle.com + * @requires vm.gc=="Serial" | vm.gc=="null" * @run main/othervm -XX:+UseSerialGC -Xmx10M EnqueuePollRace */ --- old/test/sun/tools/jps/JpsHelper.java 2014-11-06 18:29:38.248380470 +0400 +++ new/test/sun/tools/jps/JpsHelper.java 2014-11-06 18:29:38.064380466 +0400 @@ -92,7 +92,7 @@ /** * VM arguments to start test application with */ - public static final String[] VM_ARGS = {"-Xmx512m", "-XX:+UseParallelGC"}; + public static final String[] VM_ARGS = {"-Xmx512m", "-XX:+PrintGCDetails"}; /** * VM flag to start test application with */ --- old/test/sun/tools/jstat/jstatGcCauseOutput1.sh 2014-11-06 18:29:38.664380479 +0400 +++ new/test/sun/tools/jstat/jstatGcCauseOutput1.sh 2014-11-06 18:29:38.476380475 +0400 @@ -24,6 +24,7 @@ # @test # @bug 4990825 # @run shell jstatGcCauseOutput1.sh +# @requires vm.gc=="Serial" | vm.gc=="null" # @summary Test that output of 'jstat -gccause 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh