8244614: cleanup keywords used/available in hotspot testbase

Reviewed-by: coleenp, mseledtsov
openjdk · Jun 9, 2020 · dc91b066611746b33da94a3f23cc160197afe87f · dc91b06
1 parent b37d806
commit dc91b066611746b33da94a3f23cc160197afe87f
Showing 664 changed files with 566 additions and 874 deletions.
diff --git a/test/hotspot/jtreg/TEST.ROOT b/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
 

diff --git a/test/hotspot/jtreg/compiler/c2/Test8062950.java b/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
  */

diff --git a/test/hotspot/jtreg/compiler/codegen/IntRotateWithImmediate.java b/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

diff --git a/test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java b/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

diff --git a/test/hotspot/jtreg/gc/CriticalNativeArgs.java b/test/hotspot/jtreg/gc/CriticalNativeArgs.java
@@ -26,7 +26,6 @@
 
 /*
  * @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 @@
 
 /*
  * @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

diff --git a/test/hotspot/jtreg/gc/TestAgeOutput.java b/test/hotspot/jtreg/gc/TestAgeOutput.java
@@ -26,7 +26,6 @@
 /*
  * @test TestAgeOutputSerial
  * @bug 8164936
- * @key gc
  * @requires vm.gc.Serial
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
@@ -39,7 +38,6 @@
  * @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

diff --git a/test/hotspot/jtreg/gc/TestAllocateHeapAt.java b/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

diff --git a/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java b/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

diff --git a/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java b/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

diff --git a/test/hotspot/jtreg/gc/TestCardTablePageCommits.java b/test/hotspot/jtreg/gc/TestCardTablePageCommits.java
@@ -29,7 +29,6 @@
 
 /*
  * @test TestCardTablePageCommits
- * @key gc
  * @bug 8059066
  * @summary Tests that the card table does not commit the same page twice
  * @requires vm.gc.Parallel

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

diff --git a/test/hotspot/jtreg/gc/TestFullGCALot.java b/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 @@
 
 /*
  * @test TestFullGCALot
- * @key gc
  * @bug 4187687 8187819
  * @summary Ensure no access violation when using FullGCALot
  * @requires vm.debug

diff --git a/test/hotspot/jtreg/gc/TestJNIWeak/TestJNIWeak.java b/test/hotspot/jtreg/gc/TestJNIWeak/TestJNIWeak.java
@@ -28,7 +28,6 @@
  * @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

diff --git a/test/hotspot/jtreg/gc/TestMemoryInitializationWithSerial.java b/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 @@
 
 /*
  * @test TestMemoryInitializationWithSerial
- * @key gc
  * @bug 4668531
  * @library /
  * @requires vm.debug & vm.gc.Serial

diff --git a/test/hotspot/jtreg/gc/TestNUMAPageSize.java b/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 @@
 
 /**
  * @test TestNUMAPageSize
- * @key gc regression
  * @summary Make sure that start up with NUMA support does not cause problems.
  * @bug 8061467
  * @requires vm.gc != "Z"

diff --git a/test/hotspot/jtreg/gc/TestNumWorkerOutput.java b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java
@@ -27,7 +27,6 @@
  * @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

diff --git a/test/hotspot/jtreg/gc/TestObjectAlignment.java b/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 @@
 
 /**
  * @test TestObjectAlignment
- * @key gc
  * @bug 8021823
  * @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs
  * @library /test/lib

diff --git a/test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java b/test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java
@@ -25,7 +25,7 @@
 
 /**
  * @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

diff --git a/test/hotspot/jtreg/gc/TestStackOverflow.java b/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 @@
 
 /*
  * @test TestStackOverflow
- * @key gc
  * @bug 4396719
  * @summary Test verifies only that VM doesn't crash but throw expected Error.
  * @run main/othervm gc.TestStackOverflow

diff --git a/test/hotspot/jtreg/gc/TestSystemGC.java b/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,23 +25,20 @@
 
 /*
  * @test TestSystemGCSerial
- * @key gc
  * @requires vm.gc.Serial
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseSerialGC gc.TestSystemGC
  */
 
 /*
  * @test TestSystemGCParallel
- * @key gc
  * @requires vm.gc.Parallel
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UseParallelGC gc.TestSystemGC
  */
 
 /*
  * @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 @@
 
 /*
  * @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

diff --git a/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java b/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"

diff --git a/test/hotspot/jtreg/gc/TestVerifySilently.java b/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"

diff --git a/test/hotspot/jtreg/gc/TestVerifySubSet.java b/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

diff --git a/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java b/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 @@
 
 /*
  * @test TestAggressiveHeap
- * @key gc
  * @bug 8179084
  * @requires vm.gc.Parallel
  * @summary Test argument processing for -XX:+AggressiveHeap.

diff --git a/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java b/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 @@
 
 /**
  * @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 @@
 
 /**
  * @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 @@
 
 /**
  * @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 @@
 
 /**
  * @test TestAlignmentToUseLargePagesShenandoah
- * @key gc
  * @bug 8024396
  * @comment Graal does not support Shenandoah
  * @requires vm.gc.Shenandoah & !vm.graal.enabled

diff --git a/test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java b/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 @@
  * @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

diff --git a/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java b/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java
@@ -27,7 +27,6 @@
  * @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"

diff --git a/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java b/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java
@@ -25,7 +25,6 @@
 
 /*
  * @test TestG1ConcMarkStepDurationMillis
- * @key gc
  * @requires vm.gc.G1
  * @summary Tests argument processing for double type flag, G1ConcMarkStepDurationMillis
  * @library /test/lib

diff --git a/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java b/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java
@@ -25,7 +25,6 @@
 
 /*
  * @test TestG1ConcRefinementThreads
- * @key gc
  * @bug 8047976
  * @requires vm.gc.G1
  * @summary Tests argument processing for G1ConcRefinementThreads

diff --git a/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java b/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java
@@ -25,7 +25,6 @@
 
 /*
  * @test TestG1HeapRegionSize
- * @key gc
  * @bug 8021879
  * @requires vm.gc.G1
  * @summary Verify that the flag G1HeapRegionSize is updated properly