8244614: cleanup keywords used/available in hotspot testbase

Reviewed-by: coleenp, mseledtsov

test/hotspot/jtreg/TEST.ROOT

@@ -27,8 +27,11 @@
 # It also contains test-suite configuration information.
 
 # The list of keywords supported in this test suite
+# stress:               stress/slow test
+# headful:              test can be run only on headful host
+# intermittent:         flaky test, known to fail intermittently
 # randomness:           test uses randomness, test cases differ from run to run
-keys=cte_test jcmd nmt regression gc stress metaspace headful intermittent randomness
+keys=stress headful intermittent randomness
 
 groups=TEST.groups TEST.quick-groups
 

test/hotspot/jtreg/compiler/c2/Test8062950.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @bug 8062950
  * @requires vm.flavor == "server"
- * @key regression
  * @library /test/lib
  * @run driver compiler.c2.Test8062950
  */

test/hotspot/jtreg/compiler/codegen/IntRotateWithImmediate.java

@@ -26,7 +26,6 @@
  * @test
  * @bug 8080190
  * @bug 8154537
- * @key regression
  * @summary Test that the rotate distance used in the rotate instruction is properly masked with 0x1f
  *
  * @run main/othervm -Xbatch -XX:-UseOnStackReplacement compiler.codegen.IntRotateWithImmediate

test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java

@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 8068909
- * @key regression
  * @summary test that string optimizations produce code, that doesn't lead to a crash.
  *
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement

test/hotspot/jtreg/gc/CriticalNativeArgs.java

@@ -26,7 +26,6 @@ package gc;
 
 /*
  * @test CriticalNativeStressEpsilon
- * @key gc
  * @bug 8199868
  * @library /
  * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Epsilon & !vm.graal.enabled
@@ -36,7 +35,6 @@ package gc;
 
 /*
  * @test CriticalNativeStressShenandoah
- * @key gc
  * @bug 8199868
  * @library /
  * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Shenandoah & !vm.graal.enabled

test/hotspot/jtreg/gc/TestAgeOutput.java

@@ -26,7 +26,6 @@ package gc;
 /*
  * @test TestAgeOutputSerial
  * @bug 8164936
- * @key gc
  * @requires vm.gc.Serial
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
@@ -39,7 +38,6 @@ package gc;
  * @test TestAgeOutputG1
  * @bug 8164936
  * @summary Check that collectors using age table based aging print an age table even for the first garbage collection
- * @key gc
  * @requires vm.gc.G1
  * @modules java.base/jdk.internal.misc
  * @library /test/lib

test/hotspot/jtreg/gc/TestAllocateHeapAt.java

@@ -24,7 +24,6 @@
 package gc;
 
 /* @test TestAllocateHeapAt.java
- * @key gc
  * @summary Test to check allocation of Java Heap with AllocateHeapAt option
  * @requires vm.gc != "Z" & os.family != "aix"
  * @library /test/lib

test/hotspot/jtreg/gc/TestAllocateHeapAtError.java

@@ -24,7 +24,6 @@
 package gc;
 
 /* @test TestAllocateHeapAtError.java
- * @key gc
  * @summary Test to check correct handling of non-existent directory passed to AllocateHeapAt option
  * @requires vm.gc != "Z" & os.family != "aix"
  * @library /test/lib

test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java

@@ -24,7 +24,6 @@
 package gc;
 
 /* @test TestAllocateHeapAtMultiple.java
- * @key gc
  * @summary Test to check allocation of Java Heap with AllocateHeapAt option. Has multiple sub-tests to cover different code paths.
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

test/hotspot/jtreg/gc/TestCardTablePageCommits.java

@@ -29,7 +29,6 @@ import jdk.test.lib.Platform;
 
 /*
  * @test TestCardTablePageCommits
- * @key gc
  * @bug 8059066
  * @summary Tests that the card table does not commit the same page twice
  * @requires vm.gc.Parallel

test/hotspot/jtreg/gc/TestConcurrentGCBreakpoints.java

@@ -26,7 +26,6 @@ package gc;
 /*
  * @test TestConcurrentGCBreakpoints
  * @summary Test of WhiteBox concurrent GC control.
- * @key gc
  * @modules java.base
  * @library /test/lib
  * @build sun.hotspot.WhiteBox

test/hotspot/jtreg/gc/TestFullGCALot.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc;
 
 /*
  * @test TestFullGCALot
- * @key gc
  * @bug 4187687 8187819
  * @summary Ensure no access violation when using FullGCALot
  * @requires vm.debug

test/hotspot/jtreg/gc/TestJNIWeak/TestJNIWeak.java

@@ -28,7 +28,6 @@ package gc.TestJNIWeak;
  * @summary Test return of JNI weak global refs during concurrent
  * marking, verifying the use of the load barrier to keep the
  * referent alive.
- * @key gc
  * @modules java.base
  * @library /test/lib
  * @build sun.hotspot.WhiteBox

test/hotspot/jtreg/gc/TestMemoryInitializationWithSerial.java

@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@ package gc;
 
 /*
  * @test TestMemoryInitializationWithSerial
- * @key gc
  * @bug 4668531
  * @library /
  * @requires vm.debug & vm.gc.Serial

test/hotspot/jtreg/gc/TestNUMAPageSize.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc;
 
 /**
  * @test TestNUMAPageSize
- * @key gc regression
  * @summary Make sure that start up with NUMA support does not cause problems.
  * @bug 8061467
  * @requires vm.gc != "Z"

test/hotspot/jtreg/gc/TestNumWorkerOutput.java

@@ -27,7 +27,6 @@ package gc;
  * @test TestNumWorkerOutputG1
  * @bug 8165292
  * @summary Check that when PrintGCDetails is enabled, gc,task output is printed only once per collection.
- * @key gc
  * @requires vm.gc.G1
  * @modules java.base/jdk.internal.misc
  * @library /test/lib

test/hotspot/jtreg/gc/TestObjectAlignment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc;
 
 /**
  * @test TestObjectAlignment
- * @key gc
  * @bug 8021823
  * @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs
  * @library /test/lib

test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java

@@ -25,7 +25,7 @@ package gc;
 
 /**
  * @test TestSoftReferencesBehaviorOnOOME
- * @key gc randomness
+ * @key randomness
  * @summary Tests that all SoftReferences has been cleared at time of OOM.
  * @requires vm.gc != "Z"
  * @library /test/lib

test/hotspot/jtreg/gc/TestStackOverflow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc;
 
 /*
  * @test TestStackOverflow
- * @key gc
  * @bug 4396719
  * @summary Test verifies only that VM doesn't crash but throw expected Error.
  * @run main/othervm gc.TestStackOverflow

test/hotspot/jtreg/gc/TestSystemGC.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc;
 
 /*
  * @test TestSystemGCSerial
- * @key gc
  * @requires vm.gc.Serial
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseSerialGC gc.TestSystemGC
@@ -33,7 +32,6 @@ package gc;
 
 /*
  * @test TestSystemGCParallel
- * @key gc
  * @requires vm.gc.Parallel
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseParallelGC gc.TestSystemGC
@@ -41,7 +39,6 @@ package gc;
 
 /*
  * @test TestSystemGCG1
- * @key gc
  * @requires vm.gc.G1
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseG1GC gc.TestSystemGC
@@ -52,7 +49,6 @@ package gc;
 
 /*
  * @test TestSystemGCShenandoah
- * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.TestSystemGC

test/hotspot/jtreg/gc/TestVerifyDuringStartup.java

@@ -24,7 +24,6 @@
 package gc;
 
 /* @test TestVerifyDuringStartup.java
- * @key gc
  * @bug 8010463 8011343 8011898
  * @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463
  * @requires vm.gc != "Z"

test/hotspot/jtreg/gc/TestVerifySilently.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 package gc;
 
 /* @test TestVerifySilently.java
- * @key gc
  * @bug 8032771
  * @summary Test silent verification.
  * @requires vm.gc != "Z"

test/hotspot/jtreg/gc/TestVerifySubSet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 package gc;
 
 /* @test TestVerifySubSet.java
- * @key gc
  * @bug 8072725
  * @summary Test VerifySubSet option
  * @library /test/lib

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestAggressiveHeap
- * @key gc
  * @bug 8179084
  * @requires vm.gc.Parallel
  * @summary Test argument processing for -XX:+AggressiveHeap.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /**
  * @test TestAlignmentToUseLargePagesSerial
- * @key gc regression
  * @bug 8024396
  * @requires vm.gc.Serial
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseSerialGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
@@ -34,7 +33,6 @@ package gc.arguments;
 
 /**
  * @test TestAlignmentToUseLargePagesParallel
- * @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
  * @requires vm.gc.Parallel
@@ -44,7 +42,6 @@ package gc.arguments;
 
 /**
  * @test TestAlignmentToUseLargePagesG1
- * @key gc regression
  * @bug 8024396
  * @requires vm.gc.G1
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseG1GC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
@@ -53,7 +50,6 @@ package gc.arguments;
 
 /**
  * @test TestAlignmentToUseLargePagesShenandoah
- * @key gc
  * @bug 8024396
  * @comment Graal does not support Shenandoah
  * @requires vm.gc.Shenandoah & !vm.graal.enabled

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package gc.arguments;
  * @summary Sanity check that the ArrayAllocatorMallocLimit flag can be set.
  * The test helps verifying that size_t flags can be set/read.
  * @bug 8054823
- * @key gc
  * @library /test/lib
  * @library /
  * @modules java.base/jdk.internal.misc

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

@@ -27,7 +27,6 @@ package gc.arguments;
  * @test TestDisableDefaultGC
  * @summary Test that the VM complains when the default GC is disabled and no other GC is specified
  * @bug 8068579
- * @key gc
  * @library /test/lib
  * @library /
  * @requires vm.gc=="null"

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestG1ConcMarkStepDurationMillis
- * @key gc
  * @requires vm.gc.G1
  * @summary Tests argument processing for double type flag, G1ConcMarkStepDurationMillis
  * @library /test/lib

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestG1ConcRefinementThreads
- * @key gc
  * @bug 8047976
  * @requires vm.gc.G1
  * @summary Tests argument processing for G1ConcRefinementThreads

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestG1HeapRegionSize
- * @key gc
  * @bug 8021879
  * @requires vm.gc.G1
  * @summary Verify that the flag G1HeapRegionSize is updated properly

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestG1HeapSizeFlags
- * @key gc
  * @bug 8006088
  * @requires vm.gc.G1
  * @summary Tests argument processing for initial and maximum heap size for the G1 collector

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestG1PercentageOptions
- * @key gc
  * @bug 8068942
  * @requires vm.gc.G1
  * @summary Test argument processing of various percentage options

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestHeapFreeRatio
- * @key gc
  * @bug 8025661
  * @summary Test parsing of -Xminf and -Xmaxf
  * @library /test/lib

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestInitialTenuringThreshold
- * @key gc
  * @bug 8014765
  * @requires vm.gc.Parallel
  * @summary Tests argument processing for initial tenuring threshold

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestMaxMinHeapFreeRatioFlags
- * @key gc
  * @summary Verify that heap size changes according to max and min heap free ratios.
  * @requires vm.gc != "Z" & vm.gc != "Shenandoah"
  * @library /test/lib

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestMaxNewSizeSerial
- * @key gc
  * @bug 7057939
  * @summary Make sure that MaxNewSize always has a useful value after argument
  * processing.
@@ -40,7 +39,6 @@ package gc.arguments;
 
 /*
  * @test TestMaxNewSizeParallel
- * @key gc
  * @bug 7057939
  * @summary Make sure that MaxNewSize always has a useful value after argument
  * processing.
@@ -55,7 +53,6 @@ package gc.arguments;
 
 /*
  * @test TestMaxNewSizeG1
- * @key gc
  * @bug 7057939
  * @summary Make sure that MaxNewSize always has a useful value after argument
  * processing.

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestMaxRAMFlags
- * @key gc
  * @bug 8222252
  * @summary Verify correct MaxHeapSize and UseCompressedOops when MaxRAM and MaxRAMPercentage
  * are specified.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestMinAndInitialSurvivorRatioFlags
- * @key gc
  * @summary Verify that MinSurvivorRatio and InitialSurvivorRatio flags work
  * @library /test/lib
  * @library /

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /**
  * @test TestMinInitialErgonomics
- * @key gc
  * @bug 8006088
  * @requires vm.gc.Parallel
  * @summary Test Parallel GC ergonomics decisions related to minimum and initial heap size.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestNewRatioFlag
- * @key gc
  * @bug 8025166
  * @summary Verify that heap devided among generations according to NewRatio
  * @requires vm.gc != "Z" & vm.gc != "Shenandoah"

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestNewSizeFlags
- * @key gc
  * @bug 8025166
  * @summary Verify that young gen size conforms values specified by NewSize, MaxNewSize and Xmn options
  * @requires vm.gc != "Z" & vm.gc != "Shenandoah"

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestNewSizeThreadIncrease
- * @key gc
  * @bug 8144527
  * @summary Tests argument processing for NewSizeThreadIncrease
  * @library /test/lib

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestObjectTenuringFlags
- * @key gc
  * @bug 6521376
  * @requires vm.gc.Parallel
  * @summary Tests argument processing for NeverTenure, AlwaysTenure,

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestParallelGCThreads
- * @key gc
  * @bug 8059527 8081382
  * @summary Tests argument processing for ParallelGCThreads
  * @library /test/lib

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestParallelHeapSizeFlags
- * @key gc
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the
  * parallel collectors.

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestParallelRefProc
- * @key gc
  * @summary Test defaults processing for -XX:+ParallelRefProcEnabled.
  * @library /test/lib
  * @library /

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package gc.arguments;
  * @test TestSelectDefaultGC
  * @summary Test selection of GC when no GC option is specified
  * @bug 8068582
- * @key gc
  * @library /test/lib
  * @library /
  * @requires vm.gc.Serial & vm.gc.G1

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestSerialHeapSizeFlags
- * @key gc
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the Serial collector
  * @library /test/lib

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestShrinkHeapInSteps
- * @key gc
  * @summary Verify that -XX:-ShrinkHeapInSteps works properly.
  * @requires vm.gc != "Z" & vm.gc != "Shenandoah"
  * @library /test/lib

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestSoftMaxHeapSizeFlag
- * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestSurvivorRatioFlag
- * @key gc
  * @summary Verify that actual survivor ratio is equal to specified SurvivorRatio value
  * @requires vm.gc != "Z" & vm.gc != "Shenandoah"
  * @library /test/lib

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestTargetSurvivorRatioFlag
- * @key gc
  * @summary Verify that option TargetSurvivorRatio affects survivor space occupancy after minor GC.
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.UseJVMCICompiler != true

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestUnrecognizedVMOptionsHandling
- * @key gc
  * @bug 8017611
  * @summary Tests handling unrecognized VM options
  * @library /test/lib

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

@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestUseCompressedOopsErgoSerial
- * @key gc
  * @bug 8010722
  * @summary Tests ergonomics for UseCompressedOops.
  * @requires vm.gc.Serial
@@ -40,7 +39,6 @@ package gc.arguments;
 
 /*
  * @test TestUseCompressedOopsErgoParallel
- * @key gc
  * @bug 8010722
  * @summary Tests ergonomics for UseCompressedOops.
  * @requires vm.gc.Parallel
@@ -55,7 +53,6 @@ package gc.arguments;
 
 /*
  * @test TestUseCompressedOopsErgoG1
- * @key gc
  * @bug 8010722
  * @summary Tests ergonomics for UseCompressedOops.
  * @requires vm.gc.G1
@@ -70,7 +67,6 @@ package gc.arguments;
 
 /*
  * @test TestUseCompressedOopsErgoShenandoah
- * @key gc
  * @bug 8010722
  * @comment Graal does not support Shenandoah
  * @requires vm.gc.Shenandoah & !vm.graal.enabled

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package gc.arguments;
  * @summary Tests that UseNUMAInterleaving enabled for all collectors by
  * ergonomics, on all platforms when UseNUMA feature is enabled.
  * @bug 8059614
- * @key gc
  * @library /test/lib
  * @library /
  * @modules java.base/jdk.internal.misc

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package gc.arguments;
 
 /*
  * @test TestVerifyBeforeAndAfterGCFlags
- * @key gc
  * @bug 8000831
  * @summary Runs an simple application (GarbageProducer) with various
          combinations of -XX:{+|-}Verify{After|Before}GC flags and checks that

test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java

@@ -25,7 +25,6 @@ package gc.class_unloading;
 
 /*
  * @test TestClassUnloadingDisabledSerial
- * @key gc
  * @bug 8114823
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.ClassUnloading != true
@@ -43,7 +42,6 @@ package gc.class_unloading;
 
 /*
  * @test TestClassUnloadingDisabledParallel
- * @key gc
  * @bug 8114823
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.ClassUnloading != true
@@ -61,7 +59,6 @@ package gc.class_unloading;
 
 /*
  * @test TestClassUnloadingDisabledG1
- * @key gc
  * @bug 8114823
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.ClassUnloading != true
@@ -79,7 +76,6 @@ package gc.class_unloading;
 
 /*
  * @test TestClassUnloadingDisabledShenandoah
- * @key gc
  * @bug 8114823
  * @comment Graal does not support Shenandoah
  * @requires vm.gc.Shenandoah & !vm.graal.enabled

test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java

@@ -25,7 +25,6 @@ package gc.class_unloading;
 
 /*
  * @test
- * @key gc
  * @bug 8049831
  * @requires vm.gc.G1
  * @library /test/lib

test/hotspot/jtreg/gc/cslocker/TestCSLocker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ import static gc.testlibrary.Allocation.blackHole;
 
 /*
  * @test TestCSLocker
- * @key gc
  * @bug 6186200
  * @library /
  * @summary This short test check RFE 6186200 changes. One thread locked

test/hotspot/jtreg/gc/epsilon/TestAlignment.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestAlignment
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Check Epsilon runs fine with (un)usual alignments
  * @bug 8212005

test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java

@@ -23,7 +23,6 @@
 
 /**
  * @test TestAlwaysPretouch
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Basic sanity test for Epsilon
  * @run main/othervm -Xms128m -Xmx1g                     -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch

test/hotspot/jtreg/gc/epsilon/TestArraycopyCheckcast.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestArraycopyCheckcast
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon is able to handle checkcasted array copies
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestByteArrays.java

@@ -25,7 +25,7 @@ package gc.epsilon;
 
 /**
  * @test TestByteArrays
- * @key gc randomness
+ * @key randomness
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon is able to allocate arrays, and does not corrupt their state
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestClasses.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestClasses
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon is able to allocate a lot of classes
  *

test/hotspot/jtreg/gc/epsilon/TestDieDefault.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestDieDefault
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon GC should die on heap exhaustion
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestDieWithHeapDump
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon GC should die on heap exhaustion with error handler attached
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestDieWithOnError
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon GC should die on heap exhaustion with error handler attached
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java

@@ -25,7 +25,7 @@ package gc.epsilon;
 
 /**
  * @test TestElasticTLAB
- * @key gc randomness
+ * @key randomness
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon is able to work with/without elastic TLABs
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java

@@ -25,7 +25,7 @@ package gc.epsilon;
 
 /**
  * @test TestElasticTLABDecay
- * @key gc randomness
+ * @key randomness
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon is able to work with/without elastic TLABs
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestAlwaysPretouch
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Basic sanity test for Epsilon
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestHelloWorld
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Basic sanity test for Epsilon
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestHelloWorld

test/hotspot/jtreg/gc/epsilon/TestLogTrace.java

@@ -26,7 +26,6 @@ package gc.epsilon;
 
 /**
  * @test TestLogTrace
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Test that tracing does not crash Epsilon
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc*=trace gc.epsilon.TestLogTrace

test/hotspot/jtreg/gc/epsilon/TestManyThreads.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestManyThreads
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Test allocations from many threads
  *

test/hotspot/jtreg/gc/epsilon/TestMaxTLAB.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestMaxTLAB
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Check EpsilonMaxTLAB options
  * @bug 8212177

test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java

@@ -26,7 +26,6 @@ package gc.epsilon;
 
 /**
  * @test TestMemoryMXBeans
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Test JMX memory beans
  * @modules java.base/jdk.internal.misc

test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java

@@ -26,7 +26,6 @@ package gc.epsilon;
 
 /**
  * @test TestMemoryPools
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Test JMX memory pools
  * @modules java.base/jdk.internal.misc

test/hotspot/jtreg/gc/epsilon/TestObjects.java

@@ -25,7 +25,7 @@ package gc.epsilon;
 
 /**
  * @test TestObjects
- * @key gc randomness
+ * @key randomness
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon is able to allocate objects, and does not corrupt their state
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestPrintSteps
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Tests -XX:EpsilonPrintHeapSteps works
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=0    gc.epsilon.TestPrintHeapSteps

test/hotspot/jtreg/gc/epsilon/TestRefArrays.java

@@ -25,7 +25,7 @@ package gc.epsilon;
 
 /**
  * @test TestRefArrays
- * @key gc randomness
+ * @key randomness
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon is able to allocate arrays, and does not corrupt their state
  * @library /test/lib

test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java

@@ -25,7 +25,6 @@ package gc.epsilon;
 
 /**
  * @test TestUpdateCountersSteps
- * @key gc
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Test EpsilonUpdateCountersStep works
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=1    gc.epsilon.TestUpdateCountersSteps

test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java

@@ -27,7 +27,6 @@ package gc.ergonomics;
  * @test TestDynamicNumberOfGCThreads
  * @bug 8017462
  * @summary Ensure that UseDynamicNumberOfGCThreads runs
- * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox

test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java

@@ -27,7 +27,6 @@ package gc.ergonomics;
  * @test TestInitialGCThreadLogging
  * @bug 8157240
  * @summary Check trace logging of initial GC threads.
- * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox

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

@@ -25,7 +25,6 @@ package gc.g1;
 
 /*
  * @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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package gc.g1;
  * @bug 8195158
  * @summary Test that a System.gc() with -XX:+ExplicitGCInvokesConcurrent
  *          is *not* upgraded to STW full GC
- * @key gc
  * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

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

@@ -28,7 +28,6 @@ package gc.g1;
  * @bug 8027959
  * @summary Test to make sure that eager reclaim of humongous objects work. We simply try to fill
  * up the heap with humongous objects that should be eagerly reclaimable to avoid Full GC.
- * @key gc
  * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

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

@@ -28,7 +28,7 @@ package gc.g1;
  * @bug 8051973
  * @summary Test to make sure that eager reclaim of humongous objects correctly clears
  * mark bitmaps at reclaim.
- * @key gc randomness
+ * @key randomness
  * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package gc.g1;
  * @test TestEagerReclaimHumongousRegionsLog
  * @summary Check that G1 reports humongous eager reclaim statistics correctly.
  * @requires vm.gc.G1
- * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

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

@@ -31,7 +31,6 @@ package gc.g1;
  * up the heap with humongous objects and create a remembered set entry from an object by
  * referencing that we know is in the old gen. After changing this reference, the object
  * should still be eagerly reclaimable to avoid Full GC.
- * @key gc
  * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package gc.g1;
  * @bug 8152724
  * @summary Check that G1 eden plus survivor max capacity after GC does not exceed maximum number of regions.
  * @requires vm.gc.G1
- * @key gc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test TestFromCardCacheIndex.java
  * @bug 8196485
  * @summary Ensure that G1 does not miss a remembered set entry due to from card cache default value indices.
- * @key gc
  * @requires vm.gc.G1
  * @requires vm.debug
  * @requires vm.bits != "32"

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

@@ -28,7 +28,6 @@ package gc.g1;
  * @bug 8058801 8048179
  * @summary Ensure that the output for a G1TraceEagerReclaimHumongousObjects
  * includes the expected necessary messages.
- * @key gc
  * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

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

@@ -28,7 +28,6 @@ package gc.g1;
  * @bug 8035406 8027295 8035398 8019342 8027959 8048179 8027962 8069330 8076463 8150630 8160055 8177059 8166191
  * @summary Ensure the output for a minor GC with G1
  * includes the expected necessary messages.
- * @key gc
  * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package gc.g1;
  * @bug 8069367 8185278
  * @requires vm.gc.G1
  * @summary Test handling of marked but unscanned reclaimed humongous objects.
- * @key gc
  * @modules jdk.management
  * @run main/othervm -XX:+UseG1GC -Xss32m -Xmx128m -XX:G1HeapRegionSize=1m
  *      -XX:+UnlockExperimentalVMOptions

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

@@ -25,7 +25,6 @@ package gc.g1;
 
 /*
  * @test
- * @key regression gc
  * @bug 8027756
  * @requires vm.gc.G1
  * @library /test/lib

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package gc.g1;
  * @test TestHumongousRemSetsMatch
  * @bug 8205426
  * @summary Test to make sure that humongous object remset states are in sync
- * @key gc
  * @requires vm.gc.G1
  * @library /test/lib
  * @build sun.hotspot.WhiteBox

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ package gc.g1;
  * @summary Check that benign (0-sized) out of heap bounds card table invalidations do not assert.
  * @requires vm.gc.G1
  * @requires vm.debug
- * @key gc
  * @run main/othervm -XX:NewSize=1M -Xlog:gc -XX:MaxNewSize=1m -XX:-UseTLAB -XX:OldSize=63M -XX:MaxHeapSize=64M gc.g1.TestInvalidateArrayCopy
  */
 

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

@@ -27,7 +27,6 @@ package gc.g1;
  * @test TestLargePageUseForAuxMemory.java
  * @summary Test that auxiliary data structures are allocated using large pages if available.
  * @bug 8058354 8079208
- * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires vm.gc.G1

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

@@ -27,7 +27,6 @@ package gc.g1;
  * @test TestLargePageUseForHeap.java
  * @summary Test that Java heap is allocated using large pages of the appropriate size if available.
  * @bug 8221517
- * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires vm.gc.G1

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

@@ -25,7 +25,6 @@ package gc.g1;
 
 /*
  * @test TestMarkStackSizes
- * @key gc regression
  * @bug 8238855
  * @summary Consistency checks for marking flag related options.
  * @requires vm.gc.G1

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

@@ -30,7 +30,6 @@ package gc.g1;
  *          8139424 and the test will crash if an eager reclaim occur. The test is not 100% deterministic and
  *          might pass even if there are problems in the code, but it will never crash unless there is a problem.
  * @requires vm.gc.G1
- * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox