# HG changeset patch # User iignatyev # Date 1518107922 28800 # Node ID 0f1be3c7b6b2a0561668773db96ebd4ac56ce85a # Parent 6b510cb0f14f518bdbe72c737a616b62dc6a24d8 8197113: combine multiple @key tags in jtreg tests Reviewed-by: hseigel, goetz diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/TestNUMAPageSize.java --- a/test/hotspot/jtreg/gc/TestNUMAPageSize.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/TestNUMAPageSize.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 */ diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java --- a/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java --- a/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/g1/Test2GbHeap.java --- a/test/hotspot/jtreg/gc/g1/Test2GbHeap.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/g1/Test2GbHeap.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java --- a/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java Thu Feb 08 08:38:42 2018 -0800 @@ -23,8 +23,7 @@ /* * @test - * @key regression - * @key gc + * @key regression gc * @bug 8027756 * @requires vm.gc.G1 * @library /test/lib diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/g1/TestParallelAlwaysPreTouch.java --- a/test/hotspot/jtreg/gc/g1/TestParallelAlwaysPreTouch.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/g1/TestParallelAlwaysPreTouch.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 */ diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java --- a/test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java Thu Feb 08 08:38:42 2018 -0800 @@ -39,9 +39,8 @@ /** * @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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java --- a/test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java --- a/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java --- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java Thu Feb 08 08:38:42 2018 -0800 @@ -26,8 +26,7 @@ /* * @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. diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java --- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java Thu Feb 08 08:38:42 2018 -0800 @@ -26,8 +26,7 @@ /* * @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. diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java --- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java Thu Feb 08 08:38:42 2018 -0800 @@ -26,8 +26,7 @@ /* * @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. diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java --- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java Thu Feb 08 08:38:42 2018 -0800 @@ -26,8 +26,7 @@ /* * @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. diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java --- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java Thu Feb 08 08:38:42 2018 -0800 @@ -26,8 +26,7 @@ /* * @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. diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java Thu Feb 08 08:38:42 2018 -0800 @@ -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 diff -r 6b510cb0f14f -r 0f1be3c7b6b2 test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java Wed Feb 07 21:53:38 2018 +0000 +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java Thu Feb 08 08:38:42 2018 -0800 @@ -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