# HG changeset patch
# User mseledtsov
# Date 1558547490 25200
# Node ID 4cc9109caffd318ce0852882969e8d0348e0b1c6
# Parent  82fd8793ba5ed694f2cf4e1e1b250e4981edea05
8224529: [TESTBUG] JFR TestShenandoahHeapRegion* tests fail on build w/o Shenandoah
Summary: Fixed at-requires statement, updated TEST.ROOT
Reviewed-by: clanger, egahlin

diff -r 82fd8793ba5e -r 4cc9109caffd test/jdk/TEST.ROOT
--- a/test/jdk/TEST.ROOT	Wed May 22 20:39:04 2019 +0300
+++ b/test/jdk/TEST.ROOT	Wed May 22 10:51:30 2019 -0700
@@ -43,6 +43,7 @@
     sun.arch.data.model \
     java.runtime.name \
     vm.gc.Z \
+    vm.gc.Shenandoah \
     vm.graal.enabled \
     vm.compiler1.enabled \
     vm.compiler2.enabled \
diff -r 82fd8793ba5e -r 4cc9109caffd test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java	Wed May 22 20:39:04 2019 +0300
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java	Wed May 22 10:51:30 2019 -0700
@@ -38,8 +38,7 @@
 /**
  * @test
  * @bug 8221507
- * @requires vm.hasJFR
- * @requires vm.gc == "Shenandoah" | vm.gc == null
+ * @requires vm.hasJFR & vm.gc.Shenandoah
  * @key jfr
  * @library /test/lib /test/jdk
  * @run main/othervm  -Xmx32m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGarbageThreshold=1 jdk.jfr.event.gc.detailed.TestShenandoahHeapRegionInformationEvent
diff -r 82fd8793ba5e -r 4cc9109caffd test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java	Wed May 22 20:39:04 2019 +0300
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java	Wed May 22 10:51:30 2019 -0700
@@ -37,8 +37,7 @@
 /**
  * @test
  * @bug 8221507
- * @requires vm.hasJFR
- * @requires vm.gc == "Shenandoah" | vm.gc == null
+ * @requires vm.hasJFR & vm.gc.Shenandoah
  * @key jfr
  * @library /test/lib /test/jdk
  * @run main/othervm  -Xmx32m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGarbageThreshold=1 jdk.jfr.event.gc.detailed.TestShenandoahHeapRegionStateChangeEvent