--- a/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java	Wed May 08 09:50:23 2019 +0000
@@ -49,7 +49,7 @@
 /*
  * @test TestHumongousReferenceObjectShenandoah
  * @summary Test that verifies that iteration over large, plain Java objects, that potentially cross region boundaries, with references in them works.
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @bug 8151499 8153734
  * @modules java.base/jdk.internal.vm.annotation
  * @run main/othervm -XX:+EnableContended -XX:-RestrictContended -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahHeapRegionSize=8M -XX:ContendedPaddingWidth=8192 gc.TestHumongousReferenceObject

--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java	Wed May 08 09:50:23 2019 +0000
@@ -81,7 +81,7 @@
 
 /* @test TestMetaspacePerfCountersShenandoah
  * @bug 8014659
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib /
  * @summary Tests that performance counters for metaspace and compressed class
  *          space exists and works.

--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAllocHumongousFragment
  * @summary Make sure Shenandoah can recover from humongous allocation fragmentation
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048 -XX:ShenandoahGCHeuristics=passive    -XX:-ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocHumongousFragment
  * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048 -XX:ShenandoahGCHeuristics=passive    -XX:+ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocHumongousFragment

--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAllocIntArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocIntArrays
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:-ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocIntArrays

--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAllocObjectArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocObjectArrays
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:-ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocObjectArrays

--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAllocObjects
  * @summary Acceptance tests: collector can withstand allocation
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocObjects
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:-ShenandoahDegeneratedGC     -XX:+ShenandoahVerify TestAllocObjects

--- a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestArrayCopyCheckCast
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyCheckCast
  */

--- a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyStress.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyStress.java	Wed May 08 09:50:23 2019 +0000
@@ -26,7 +26,7 @@
 /*
  * @test TestArrayCopyStress
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyStress
  */

--- a/test/hotspot/jtreg/gc/shenandoah/TestElasticTLAB.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestElasticTLAB.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestElasticTLAB
  * @summary Test that Shenandoah is able to work with elastic TLABs
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -XX:-UseTLAB -XX:-ShenandoahElasticTLAB -XX:+ShenandoahVerify TestElasticTLAB
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -XX:-UseTLAB -XX:-ShenandoahElasticTLAB                       TestElasticTLAB

--- a/test/hotspot/jtreg/gc/shenandoah/TestEvilSyncBug.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestEvilSyncBug.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestEvilSyncBug
  * @summary Tests for crash/assert when attaching init thread during shutdown
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestGCThreadGroups
  * @summary Test Shenandoah GC uses concurrent/parallel threads correctly
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ConcGCThreads=2 -XX:ParallelGCThreads=4 -Xmx16m                                         -Dtarget=1000 TestGCThreadGroups
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-UseDynamicNumberOfGCThreads            -Xmx16m                                         -Dtarget=1000 TestGCThreadGroups

--- a/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestHeapUncommit
  * @summary Acceptance tests: collector can withstand allocation
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:ShenandoahGCHeuristics=passive                 -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestHeapUncommit
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:ShenandoahGCHeuristics=passive                 -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestHeapUncommit

--- a/test/hotspot/jtreg/gc/shenandoah/TestHumongousThreshold.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestHumongousThreshold.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestHumongousThreshold
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g
  *                   -XX:+ShenandoahVerify

--- a/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestLargeObjectAlignment
  * @summary Shenandoah crashes with -XX:ObjectAlignmentInBytes=16
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xint                   TestLargeObjectAlignment
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -XX:-TieredCompilation  TestLargeObjectAlignment

--- a/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestLotsOfCycles
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx16m -XX:ShenandoahGCHeuristics=passive      -Dtarget=10000 -XX:+ShenandoahDegeneratedGC     TestLotsOfCycles
  * @run main/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx16m -XX:ShenandoahGCHeuristics=passive      -Dtarget=10000 -XX:-ShenandoahDegeneratedGC     TestLotsOfCycles

--- a/test/hotspot/jtreg/gc/shenandoah/TestParallelRefprocSanity.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestParallelRefprocSanity.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestParallelRefprocSanity
  * @summary Test that reference processing works with both parallel and non-parallel variants.
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g                              TestParallelRefprocSanity
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g  -XX:-ParallelRefProcEnabled TestParallelRefprocSanity

--- a/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestPeriodicGC
  * @summary Test that periodic GC is working
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run driver TestPeriodicGC
  */

--- a/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestRefprocSanity
  * @summary Test that null references/referents work fine
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g                                                             TestRefprocSanity
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:+ShenandoahVerify                                       TestRefprocSanity

--- a/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java	Wed May 08 09:50:23 2019 +0000
@@ -23,7 +23,7 @@
 
 /*
  * @test TestRegionSampling
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g                                         -XX:+ShenandoahRegionSampling TestRegionSampling
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahRegionSampling TestRegionSampling

--- a/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestRetainObjects
  * @summary Acceptance tests: collector can deal with retained objects
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestRetainObjects
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestRetainObjects

--- a/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestSieveObjects
  * @summary Acceptance tests: collector can deal with retained objects
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestSieveObjects
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:ShenandoahGCHeuristics=passive      -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestSieveObjects

--- a/test/hotspot/jtreg/gc/shenandoah/TestSmallHeap.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestSmallHeap.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestSmallHeap
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC         TestSmallHeap
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx64m TestSmallHeap

--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestStringDedup
  * @summary Test Shenandoah string deduplication implementation
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open

--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestStringDedupStress
  * @summary Test Shenandoah string deduplication implementation
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open

--- a/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestStringInternCleanup
  * @summary Check that Shenandoah cleans up interned strings
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ClassUnloadingWithConcurrentMark -Xmx64m -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestStringInternCleanup
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ClassUnloadingWithConcurrentMark -Xmx64m -XX:ShenandoahGCHeuristics=passive      -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify TestStringInternCleanup

--- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestVerifyJCStress
  * @summary Tests that we pass at least one jcstress-like test with all verification turned on
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm  -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions

--- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyLevels.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyLevels.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestVerifyLevels
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UnlockDiagnosticVMOptions -Xmx128m -XX:+ShenandoahVerify -XX:ShenandoahVerifyLevel=0 TestVerifyLevels
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UnlockDiagnosticVMOptions -Xmx128m -XX:+ShenandoahVerify -XX:ShenandoahVerifyLevel=1 TestVerifyLevels

--- a/test/hotspot/jtreg/gc/shenandoah/TestWithLogLevel.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestWithLogLevel.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestWithLogLevel
  * @summary Test Shenandoah with different log levels
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xms256M -Xmx1G -Xlog:gc*=error   TestWithLogLevel
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xms256M -Xmx1G -Xlog:gc*=warning TestWithLogLevel

--- a/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestWrongArrayMember
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC                                      TestWrongArrayMember
  * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=traversal TestWrongArrayMember

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1ArrayCopyNPE.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1ArrayCopyNPE.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /* @test TestC1ArrayCopyNPE
  * @summary test C1 arraycopy intrinsic
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestC1ArrayCopyNPE
  */
 

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1VectorizedMismatch.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1VectorizedMismatch.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /* @test TestC1VectorizedMismatch
  * @summary test C1 vectorized mismatch intrinsic
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestC1VectorizedMismatch
  */
 

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestCommonGCLoads.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestCommonGCLoads.java	Wed May 08 09:50:23 2019 +0000
@@ -26,7 +26,7 @@
  * @summary Test GC state load commoning works
  * @key gc
  * @requires vm.flavor == "server"
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
  *                   -XX:-ShenandoahCommonGCStateLoads

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestExpandedWBLostNullCheckDep.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestExpandedWBLostNullCheckDep.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestExpandedWBLostNullCheckDep
  * @summary Logic that moves a null check in the expanded barrier may cause a memory access that doesn't depend on the barrier to bypass the null check
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @requires vm.flavor == "server"
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestMaybeNullUnsafeAccess
  * @summary cast before unsafe access moved in dominating null check null path causes crash
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestNullCheck.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestNullCheck.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestNullCheck
  * @summary implicit null check on brooks pointer must not cause crash
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
  *                   -Xmx4G -XX:HeapBaseMinAddress=0x800000000 TestNullCheck

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestReferenceCAS.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestReferenceCAS.java	Wed May 08 09:50:23 2019 +0000
@@ -29,7 +29,7 @@
  * @test TestReferenceCAS
  * @summary Shenandoah reference CAS test
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -Diters=20000 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahGCHeuristics=aggressive -XX:+UseShenandoahGC                                                 TestReferenceCAS

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeOffheapSwap.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeOffheapSwap.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestUnsafeOffheapSwap
  * @summary Miscompilation in Unsafe off-heap swap routines
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation

--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestWriteBarrierClearControl
  * @summary Clearing control during final graph reshape causes memory barrier to loose dependency on null check
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM -XX:+StressGCM

--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /* @test TestJNICritical
  * @summary test JNI critical arrays support in Shenandoah
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahVerify                 TestJNICritical
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestJNICritical

--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestJNIGlobalRefs.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestJNIGlobalRefs.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /* @test TestJNIGlobalRefs
  * @summary Test JNI Global Refs with Shenandoah
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xlog:gc -XX:ShenandoahGCHeuristics=aggressive -XX:+ShenandoahVerify TestJNIGlobalRefs
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xlog:gc -XX:ShenandoahGCHeuristics=aggressive                       TestJNIGlobalRefs
  */

--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestPinnedGarbage.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestPinnedGarbage.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /* @test TestPinnedGarbage
  * @summary Test that garbage in the pinned region does not crash VM
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx512m -XX:+ShenandoahVerify -XX:ShenandoahGCHeuristics=passive    -XX:+ShenandoahDegeneratedGC TestPinnedGarbage
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx512m -XX:+ShenandoahVerify -XX:ShenandoahGCHeuristics=passive    -XX:-ShenandoahDegeneratedGC TestPinnedGarbage

--- a/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestHeapDump
  * @summary Tests JVMTI heap dumps
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @compile TestHeapDump.java
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive -XX:+UseCompressedOops TestHeapDump
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive -XX:-UseCompressedOops TestHeapDump

--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestChurnNotifications
  * @summary Check that MX notifications are reported for all cycles
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=passive      -XX:+ShenandoahDegeneratedGC -Dprecise=true  TestChurnNotifications
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=passive      -XX:-ShenandoahDegeneratedGC -Dprecise=true  TestChurnNotifications

--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryMXBeans.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryMXBeans.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestMemoryMXBeans
  * @summary Test JMX memory beans
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC          -Xmx1g TestMemoryMXBeans   -1 1024

--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryPools.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryPools.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestMemoryPools
  * @summary Test JMX memory pools
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g TestMemoryPools

--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestPauseNotifications
  * @summary Check that MX notifications are reported for all cycles
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=passive       -XX:+ShenandoahDegeneratedGC TestPauseNotifications
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=passive       -XX:-ShenandoahDegeneratedGC TestPauseNotifications

--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAllocLargeObj
  * @summary Test allocation of small object to result OOM, but not to crash JVM
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run main TestAllocLargeObj
  */

--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAllocLargerThanHeap
  * @summary Test that allocation of the object larger than heap fails predictably
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run main TestAllocLargerThanHeap
  */

--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAllocSmallObj
  * @summary Test allocation of small object to result OOM, but not to crash JVM
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run main TestAllocSmallObj
  */

--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestClassLoaderLeak
  * @summary Test OOME in due to classloader leak
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run main TestClassLoaderLeak
  */

--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestThreadFailure
  * @summary Test OOME in separate thread is recoverable
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run main TestThreadFailure
  */

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestAlwaysPreTouch.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestAlwaysPreTouch.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestAlwaysPreTouch
  * @summary Check that Shenandoah's AlwaysPreTouch does not fire asserts
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+AlwaysPreTouch                                  -Xmx1g TestAlwaysPreTouch
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+AlwaysPreTouch -XX:ConcGCThreads=2              -Xmx1g TestAlwaysPreTouch

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestArgumentRanges
  * @summary Test that Shenandoah arguments are checked for ranges where applicable
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestClassUnloadingArguments
  * @summary Test that loop mining arguments are sane
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run driver TestClassUnloadingArguments
  */

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java	Wed May 08 09:50:23 2019 +0000
@@ -23,7 +23,7 @@
 
 /* @test TestCodeCacheRootStyles
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=0 TestCodeCacheRootStyles
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=1 TestCodeCacheRootStyles
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=2 TestCodeCacheRootStyles

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java	Wed May 08 09:50:23 2019 +0000
@@ -26,7 +26,7 @@
  * @summary Check that ShenandoahCriticalControlThreadPriority works
  * @bug 8217343
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestEnabled.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestEnabled.java	Wed May 08 09:50:23 2019 +0000
@@ -27,7 +27,7 @@
 /*
  * @test TestEnabled
  * @key gc
- * @requires vm.gc.Shenandoah & vm.gc == "null"
+ * @requires vm.gc.Shenandoah & vm.gc == "null" & !vm.graal.enabled
  * @run main/othervm -Dexpected=false -Xmx64m                                                       TestEnabled
  * @run main/othervm -Dexpected=true  -Xmx64m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC TestEnabled
  */
@@ -35,7 +35,7 @@
 /*
  * @test TestEnabledAlready
  * @key gc
- * @requires vm.gc.Shenandoah & vm.gc == "Shenandoah"
+ * @requires vm.gc.Shenandoah & vm.gc == "Shenandoah" & !vm.graal.enabled
  * @run main/othervm -Dexpected=true -Xmx64m                                                        TestEnabled
  */
 public class TestEnabled {

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestExplicitGC
  * @summary Test that Shenandoah reacts to explicit GC flags appropriately
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestExplicitGCNoConcurrent
  * @summary Test that Shenandoah reacts to explicit GC flags appropriately
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestHeuristicsUnlock
  * @summary Test that Shenandoah heuristics are unlocked properly
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestHumongousThresholdArgs
  * @summary Test that Shenandoah humongous threshold args are checked
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestLoopMiningArguments
  * @summary Test that loop mining arguments are sane
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run driver TestLoopMiningArguments
  */

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestObjectAlignment
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16          TestObjectAlignment
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xmx16m  TestObjectAlignment

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestPacing.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestPacing.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestPacing
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-ShenandoahPacing -Xmx128m TestPacing
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahPacing -Xmx128m TestPacing

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestParallelRegionStride.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestParallelRegionStride.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestParallelRegionStride
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelRegionStride=1    -Xmx128m TestParallelRegionStride
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelRegionStride=10   -Xmx128m TestParallelRegionStride

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @test TestRegionSizeArgs
  * @summary Test that Shenandoah region size args are checked
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSafepointWorkers.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSafepointWorkers.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /*
  * @test TestSingleSafepointWorker
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelSafepointThreads=1 -Xmx128m TestSafepointWorkers
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelSafepointThreads=2 -Xmx128m TestSafepointWorkers

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java	Wed May 08 09:50:23 2019 +0000
@@ -25,7 +25,7 @@
  * @summary Test selective barrier enabling works, by aggressively compiling HelloWorld with combinations
  *          of barrier flags
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run main/othervm TestSelectiveBarrierFlags -Xint
  * @run main/othervm TestSelectiveBarrierFlags -Xbatch -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSingleThreaded.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSingleThreaded.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /* @test TestSingleThreaded
  * @summary test single worker threaded Shenandoah
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *                   -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
  *                   -XX:ParallelGCThreads=1 -XX:ConcGCThreads=1 TestSingleThreaded

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	Wed May 08 09:50:23 2019 +0000
@@ -24,7 +24,7 @@
 /* @test TestWrongBarrierDisable
  * @summary Test that disabling wrong barriers fails early
  * @key gc
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
  * @run main/othervm TestWrongBarrierDisable
  */

--- a/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java	Wed May 08 09:50:23 2019 +0000
@@ -26,7 +26,7 @@
 /*
 * @test TestShenandoah
 * @key gc
-* @requires vm.gc.Shenandoah
+* @requires vm.gc.Shenandoah & !vm.graal.enabled
 * @bug 8006398
 * @summary Test that the Shenandoah collector does not print a warning message
 * @library /test/lib

--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java	Wed May 08 09:50:23 2019 +0000
@@ -30,7 +30,7 @@
  * @key gc
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
  * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
  *

--- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java	Wed May 08 09:50:23 2019 +0000
@@ -28,7 +28,7 @@
  * @test TestGCLockerWithShenandoah
  * @key gc
  * @library /
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @summary Stress Shenandoah's JNI handling by calling GetPrimitiveArrayCritical while concurrently filling up old gen.
  * @run main/native/othervm/timeout=200 -Xlog:gc*=info -Xms1500m -Xmx1500m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+ShenandoahVerify -XX:+UseShenandoahGC gc.stress.gclocker.TestGCLockerWithShenandoah
  * @run main/native/othervm/timeout=200 -Xlog:gc*=info -Xms1500m -Xmx1500m -XX:+UnlockExperimentalVMOptions                                                      -XX:+UseShenandoahGC gc.stress.gclocker.TestGCLockerWithShenandoah

--- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java	Wed May 08 20:28:56 2019 -0700
+++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java	Wed May 08 09:50:23 2019 +0000
@@ -29,7 +29,7 @@
  * @key gc
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+ShenandoahVerify -XX:+UseShenandoahGC gc.stress.systemgc.TestSystemGCWithShenandoah 270
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+ShenandoahVerify -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=traversal gc.stress.systemgc.TestSystemGCWithShenandoah 270