From 0b3b3b1c4312fd3e56b2a5a0e73f02040fb38bfc Mon Sep 17 00:00:00 2001 From: Mikhailo Seledtsov Date: Wed, 22 May 2019 10:51:30 -0700 Subject: [PATCH] 8224529: [TESTBUG] JFR TestShenandoahHeapRegion* tests fail on build w/o Shenandoah Fixed at-requires statement, updated TEST.ROOT Reviewed-by: clanger, egahlin --- test/jdk/TEST.ROOT | 1 + .../gc/detailed/TestShenandoahHeapRegionInformationEvent.java | 3 +-- .../gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT index 784b2bcfff3..bbaae892450 100644 --- a/test/jdk/TEST.ROOT +++ b/test/jdk/TEST.ROOT @@ -43,6 +43,7 @@ requires.properties= \ sun.arch.data.model \ java.runtime.name \ vm.gc.Z \ + vm.gc.Shenandoah \ vm.graal.enabled \ vm.compiler1.enabled \ vm.compiler2.enabled \ diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java index 3e53dacd417..1bd1eea0010 100644 --- a/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java +++ b/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java @@ -38,8 +38,7 @@ import jdk.test.lib.jfr.GCHelper; /** * @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 --git a/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java index 78dfc75c955..5b84213419c 100644 --- a/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java +++ b/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java @@ -37,8 +37,7 @@ import jdk.test.lib.jfr.GCHelper; /** * @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