From 1edc74c1e94a1a3477678c221385b2288ccbfa8b Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@redhat.com>
Date: Mon, 8 Nov 2021 09:57:34 +0100
Subject: [PATCH 1/2] Fix

---
 test/hotspot/jtreg/gc/TestSystemGC.java | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/test/hotspot/jtreg/gc/TestSystemGC.java b/test/hotspot/jtreg/gc/TestSystemGC.java
index 9aff5a3b18121..2f5b03ed0411c 100644
--- a/test/hotspot/jtreg/gc/TestSystemGC.java
+++ b/test/hotspot/jtreg/gc/TestSystemGC.java
@@ -24,39 +24,46 @@
 package gc;
 
 /*
- * @test TestSystemGCSerial
+ * @test id=serial
  * @requires vm.gc.Serial
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseSerialGC gc.TestSystemGC
+ * @run main/othervm -XX:+UseSerialGC -XX:+UseLargePages gc.TestSystemGC
  */
 
 /*
- * @test TestSystemGCParallel
+ * @test id=parallel
  * @requires vm.gc.Parallel
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseParallelGC gc.TestSystemGC
+ * @run main/othervm -XX:+UseParallelGC -XX:+UseLargePages gc.TestSystemGC
  */
 
 /*
- * @test TestSystemGCG1
+ * @test id=g1
  * @requires vm.gc.G1
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseG1GC gc.TestSystemGC
  * @run main/othervm -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent gc.TestSystemGC
+ * @run main/othervm -XX:+UseG1GC -XX:+UseLargePages gc.TestSystemGC
  */
 
 /*
- * @test TestSystemGCShenandoah
+ * @test id=shenandoah
  * @requires vm.gc.Shenandoah
  * @summary Runs System.gc() with different flags.
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.TestSystemGC
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ExplicitGCInvokesConcurrent gc.TestSystemGC
+ * @run main/othervm -XX:+UseShenandoahGC gc.TestSystemGC
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+ExplicitGCInvokesConcurrent gc.TestSystemGC
+ * @run main/othervm -XX:+UseShenandoahGC -XX:+UseLargePages gc.TestSystemGC
  */
 
 /*
- * @test TestSystemGCLargePages
+ * @test id=z
+ * @requires vm.gc.Z
+ * @comment ZGC would not start when LargePages cannot be allocated, therefore
+ *          we do not run such configuration.
  * @summary Runs System.gc() with different flags.
- * @run main/othervm -XX:+UseLargePages gc.TestSystemGC
+ * @run main/othervm -XX:+UseZGC gc.TestSystemGC
  */
 
 public class TestSystemGC {

From 15170896a122aa82963d7754b543cf8225c70e45 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@redhat.com>
Date: Tue, 9 Nov 2021 15:19:20 +0100
Subject: [PATCH 2/2] Review comments

---
 test/hotspot/jtreg/gc/TestSystemGC.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/hotspot/jtreg/gc/TestSystemGC.java b/test/hotspot/jtreg/gc/TestSystemGC.java
index 2f5b03ed0411c..9cef6bbdb0145 100644
--- a/test/hotspot/jtreg/gc/TestSystemGC.java
+++ b/test/hotspot/jtreg/gc/TestSystemGC.java
@@ -24,7 +24,7 @@
 package gc;
 
 /*
- * @test id=serial
+ * @test id=Serial
  * @requires vm.gc.Serial
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseSerialGC gc.TestSystemGC
@@ -32,7 +32,7 @@
  */
 
 /*
- * @test id=parallel
+ * @test id=Parallel
  * @requires vm.gc.Parallel
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseParallelGC gc.TestSystemGC
@@ -40,7 +40,7 @@
  */
 
 /*
- * @test id=g1
+ * @test id=G1
  * @requires vm.gc.G1
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseG1GC gc.TestSystemGC
@@ -49,7 +49,7 @@
  */
 
 /*
- * @test id=shenandoah
+ * @test id=Shenandoah
  * @requires vm.gc.Shenandoah
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseShenandoahGC gc.TestSystemGC
@@ -58,9 +58,9 @@
  */
 
 /*
- * @test id=z
+ * @test id=Z
  * @requires vm.gc.Z
- * @comment ZGC would not start when LargePages cannot be allocated, therefore
+ * @comment ZGC will not start when LargePages cannot be allocated, therefore
  *          we do not run such configuration.
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseZGC gc.TestSystemGC