From a5a5967c1ad057b2717a65e62502ef70aec530df Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@redhat.com>
Date: Tue, 8 Sep 2020 18:19:42 +0200
Subject: [PATCH] Fix some missing tests too

---
 .../jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java  | 2 +-
 .../gc/stress/gcbasher/TestGCBasherWithShenandoah.java      | 4 ++--
 .../gc/stress/gclocker/TestGCLockerWithShenandoah.java      | 2 +-
 .../jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java
index f5e878a50d950..ccfbf4304ac64 100644
--- a/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java
+++ b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *
  * @requires os.arch=="aarch64" & vm.debug == true &
- *           vm.flavor == "server" & !vm.graal.enabled &
+ *           vm.flavor == "server" &
  *           vm.gc.Shenandoah
  *
  * @build compiler.c2.aarch64.TestVolatiles
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
index c9d19c8f1e1f0..651666b180152 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
@@ -91,7 +91,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -212,7 +212,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
diff --git a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java
index 09fb69f2433ad..5db076e042d93 100644
--- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java
+++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java
@@ -43,7 +43,7 @@
 /*
  * @test TestGCLockerWithShenandoah
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @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
diff --git a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
index af7335d163ccf..ee949dd436342 100644
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
@@ -77,7 +77,7 @@
  * @test TestGCOldWithShenandoah
  * @key stress randomness
  * @library / /test/lib
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=600 -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -94,7 +94,7 @@
  * @test TestGCOldWithShenandoah
  * @key stress randomness
  * @library / /test/lib
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -128,7 +128,7 @@
  * @test TestGCOldWithShenandoah
  * @key stress randomness
  * @library / /test/lib
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=600 -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions