8263725: JFR oldobject tests are not run when GCs are specified explicitly
Reviewed-by: tschatzl, mgronlun
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestAllocationTime.java b/test/jdk/jdk/jfr/event/oldobject/TestAllocationTime.java
index a7830e3..7ddcf9c 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestAllocationTime.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestAllocationTime.java
@@ -41,7 +41,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestAllocationTime
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestArrayInformation.java b/test/jdk/jdk/jfr/event/oldobject/TestArrayInformation.java
index 4e117a6..d17f4ed 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestArrayInformation.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestArrayInformation.java
@@ -40,7 +40,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestArrayInformation
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestCircularReference.java b/test/jdk/jdk/jfr/event/oldobject/TestCircularReference.java
index 3e72d2ca..3eff250 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestCircularReference.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestCircularReference.java
@@ -37,7 +37,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestCircularReference
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestClassLoaderLeak.java b/test/jdk/jdk/jfr/event/oldobject/TestClassLoaderLeak.java
index 0828fc0..fe112ac 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestClassLoaderLeak.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestClassLoaderLeak.java
@@ -42,7 +42,7 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
+ * @requires vm.gc != "Serial"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestClassLoaderLeak
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestFieldInformation.java b/test/jdk/jdk/jfr/event/oldobject/TestFieldInformation.java
index 092070d..6c56f4f 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestFieldInformation.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestFieldInformation.java
@@ -42,7 +42,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k -Xlog:gc+tlab=trace jdk.jfr.event.oldobject.TestFieldInformation
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestG1.java b/test/jdk/jdk/jfr/event/oldobject/TestG1.java
index 2d3f142..69212db 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestG1.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestG1.java
@@ -38,7 +38,7 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
+ * @requires vm.gc.G1
* @summary Test leak profiler with G1 GC
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestHeapDeep.java b/test/jdk/jdk/jfr/event/oldobject/TestHeapDeep.java
index 1f17160..9c1b3de 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestHeapDeep.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestHeapDeep.java
@@ -37,7 +37,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestHeapDeep
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestHeapShallow.java b/test/jdk/jdk/jfr/event/oldobject/TestHeapShallow.java
index c1f7a8d..1be5e4a 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestHeapShallow.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestHeapShallow.java
@@ -36,7 +36,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestHeapShallow
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestLargeRootSet.java b/test/jdk/jdk/jfr/event/oldobject/TestLargeRootSet.java
index 3e289f3..72915bd 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestLargeRootSet.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestLargeRootSet.java
@@ -47,7 +47,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestLargeRootSet
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java b/test/jdk/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java
index 17efbb6..8412464 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java
@@ -41,7 +41,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestLastKnownHeapUsage
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestListenerLeak.java b/test/jdk/jdk/jfr/event/oldobject/TestListenerLeak.java
index a275eda..2093e5e 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestListenerLeak.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestListenerLeak.java
@@ -38,7 +38,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestListenerLeak
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestMetadataRetention.java b/test/jdk/jdk/jfr/event/oldobject/TestMetadataRetention.java
index 60946bb..9695392 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestMetadataRetention.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestMetadataRetention.java
@@ -45,7 +45,6 @@
* @test
* @summary The test verifies that an old object sample maintains references to "stale" metadata
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @key jfr
* @modules jdk.jfr/jdk.jfr.internal.test
* @library /test/lib /test/jdk
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestObjectAge.java b/test/jdk/jdk/jfr/event/oldobject/TestObjectAge.java
index ebed285..b15d6eb 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestObjectAge.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestObjectAge.java
@@ -39,7 +39,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestObjectAge
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java b/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java
index c979c6e..cabb201 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java
@@ -43,7 +43,7 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
+ * @requires vm.gc != "Z"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestObjectDescription
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestParallel.java b/test/jdk/jdk/jfr/event/oldobject/TestParallel.java
index ba0b6ea..946fa60 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestParallel.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestParallel.java
@@ -38,7 +38,7 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
+ * @requires vm.gc.Parallel
* @summary Test leak profiler with Parallel GC
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestReferenceChainLimit.java b/test/jdk/jdk/jfr/event/oldobject/TestReferenceChainLimit.java
index 75e41ae..06d1e7f 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestReferenceChainLimit.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestReferenceChainLimit.java
@@ -36,7 +36,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
* @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestReferenceChainLimit
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestSanityDefault.java b/test/jdk/jdk/jfr/event/oldobject/TestSanityDefault.java
index 10c26c6..7432943 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestSanityDefault.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestSanityDefault.java
@@ -37,7 +37,6 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
* @library /test/lib /test/jdk
* @summary Purpose of this test is to run leak profiler without command line tweaks or WhiteBox hacks until we succeed
* @run main/othervm jdk.jfr.event.oldobject.TestSanityDefault
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestSerial.java b/test/jdk/jdk/jfr/event/oldobject/TestSerial.java
index 905b187..fcbf425 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestSerial.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestSerial.java
@@ -38,7 +38,7 @@
* @test
* @key jfr
* @requires vm.hasJFR
- * @requires vm.gc == "null"
+ * @requires vm.gc.Serial
* @summary Test leak profiler with Serial GC
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestZ.java b/test/jdk/jdk/jfr/event/oldobject/TestZ.java
index ae5044f..681356b 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestZ.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestZ.java
@@ -38,7 +38,6 @@
* @test
* @key jfr
* @requires vm.hasJFR & vm.gc.Z
- * @requires vm.gc == "null"
* @summary Test leak profiler with ZGC
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal.test
