8197113: combine multiple @key tags in jtreg tests

Reviewed-by: hseigel, goetz

test/hotspot/jtreg/gc/TestNUMAPageSize.java

@@ -23,11 +23,10 @@
 
 /**
  * @test TestNUMAPageSize
+ * @key gc regression
  * @summary Make sure that start up with NUMA support does not cause problems.
  * @bug 8061467
  * @requires (vm.opt.AggressiveOpts == null) | (vm.opt.AggressiveOpts == false)
- * @key gc
- * @key regression
  * @run main/othervm -Xmx8M -XX:+UseNUMA TestNUMAPageSize
  */
 

test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java

@@ -23,11 +23,10 @@
 
 /**
  * @test TestAlignmentToUseLargePages
+ * @key gc regression
  * @summary All parallel GC variants may use large pages without the requirement that the
  * heap alignment is large page aligned. Other collectors also need to start up with odd sized heaps.
  * @bug 8024396
- * @key gc
- * @key regression
  * @requires vm.gc=="null"
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:+UseLargePages TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:-UseLargePages TestAlignmentToUseLargePages

test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java

@@ -23,10 +23,9 @@
 
 /**
  * @test GuardShrinkWarning
+ * @key gc regression
  * @summary Remove warning about CMS generation shrinking.
  * @bug 8012111
- * @key gc
- * @key regression
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

test/hotspot/jtreg/gc/g1/Test2GbHeap.java

@@ -23,13 +23,12 @@
 
 /*
  * @test Test2GbHeap
+ * @key gc regression
  * @bug 8031686
  * @summary Regression test to ensure we can start G1 with 2gb heap.
  * Skip test on 32 bit system: it typically does not support the many and large virtual memory reservations needed.
  * @requires vm.gc.G1
  * @requires vm.bits != "32"
- * @key gc
- * @key regression
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java

@@ -23,8 +23,7 @@
 
 /*
  * @test
- * @key regression
- * @key gc
+ * @key regression gc
  * @bug 8027756
  * @requires vm.gc.G1
  * @library /test/lib

test/hotspot/jtreg/gc/g1/TestParallelAlwaysPreTouch.java

@@ -23,13 +23,12 @@
 
 /*
  * @test
+ * @key gc regression
  * @bug 8169703
  * @summary Regression test to ensure AlwaysPreTouch with multiple threads works at mutator time.
  * Allocates a few humongous objects that will be allocated by expanding the heap, causing concurrent parallel
  * pre-touch.
  * @requires vm.gc.G1
- * @key gc
- * @key regression
  * @run main/othervm -XX:+UseG1GC -Xms10M -Xmx100m -XX:G1HeapRegionSize=1M -XX:+AlwaysPreTouch -XX:PreTouchParallelChunkSize=512k -Xlog:gc+ergo+heap=debug,gc+heap=debug,gc=debug TestParallelAlwaysPreTouch
  */
 

test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java

@@ -39,9 +39,8 @@ import java.util.Random;
 
 /**
  * @test TestUnifiedLoggingSwitchStress
+ * @key gc stress
  * @summary Switches gc log level on fly while stressing memory/gc
- * @key gc
- * @key stress
  * @requires !vm.flightRecorder
  * @library /test/lib /
  * @modules java.management java.base/jdk.internal.misc

test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java

@@ -23,10 +23,9 @@
 
 /**
  * @test AdaptiveGCBoundary
+ * @key gc regression
  * @summary UseAdaptiveGCBoundary is broken
  * @bug 8014546
- * @key gc
- * @key regression
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java

@@ -23,8 +23,7 @@
 
 /*
  * @test TestStressG1Humongous
- * @key gc
- * @key stress
+ * @key gc stress
  * @summary Stress G1 by humongous allocations in situation near OOM
  * @requires vm.gc.G1
  * @requires !vm.flightRecorder

test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java

@@ -26,8 +26,7 @@ import java.io.IOException;
 
 /*
  * @test TestGCBasherWithAllocateHeapAt
- * @key gc
- * @key stress
+ * @key gc stress
  * @requires vm.gc.G1
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress Java heap allocation with AllocateHeapAt flag using GC basher.

test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java

@@ -26,8 +26,7 @@ import java.io.IOException;
 
 /*
  * @test TestGCBasherWithCMS
- * @key gc
- * @key stress
+ * @key gc stress
  * @requires vm.gc.ConcMarkSweep
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the CMS GC by trying to make old objects more likely to be garbage than young objects.

test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java

@@ -26,8 +26,7 @@ import java.io.IOException;
 
 /*
  * @test TestGCBasherWithG1
- * @key gc
- * @key stress
+ * @key gc stress
  * @requires vm.gc.G1
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the G1 GC by trying to make old objects more likely to be garbage than young objects.

test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java

@@ -26,8 +26,7 @@ import java.io.IOException;
 
 /*
  * @test TestGCBasherWithParallel
- * @key gc
- * @key stress
+ * @key gc stress
  * @requires vm.gc.Parallel
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Parallel GC by trying to make old objects more likely to be garbage than young objects.

test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java

@@ -26,8 +26,7 @@ import java.io.IOException;
 
 /*
  * @test TestGCBasherWithSerial
- * @key gc
- * @key stress
+ * @key gc stress
  * @requires vm.gc.Serial
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Serial GC by trying to make old objects more likely to be garbage than young objects.

test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java

@@ -24,9 +24,8 @@
 
 /*
  * @test TestSystemGCWithCMS
+ * @key gc stress
  * @bug 8190703
- * @key gc
- * @key stress
  * @requires vm.gc.ConcMarkSweep
  * @summary Stress the CMS GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UseConcMarkSweepGC TestSystemGCWithCMS 270

test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java

@@ -24,9 +24,8 @@
 
 /*
  * @test TestSystemGCWithG1
+ * @key gc stress
  * @bug 8190703
- * @key gc
- * @key stress
  * @requires vm.gc.G1
  * @summary Stress the G1 GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UseG1GC TestSystemGCWithG1 270

test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java

@@ -24,9 +24,8 @@
 
 /*
  * @test TestSystemGCWithParallel
+ * @key gc stress
  * @bug 8190703
- * @key gc
- * @key stress
  * @requires vm.gc.Parallel
  * @summary Stress the Parallel GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  * @run main/othervm/timeout=300 -Xlog:gc=info -Xmx512m -XX:+UseParallelGC TestSystemGCWithParallel 270

test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java

@@ -24,9 +24,8 @@
 
 /*
  * @test TestSystemGCWithSerial
+ * @key gc stress
  * @bug 8190703
- * @key gc
- * @key stress
  * @requires vm.gc.Serial
  * @summary Stress the Serial GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UseSerialGC TestSystemGCWithSerial 270