changeset 59072:4c54203ef3ea

8243933: use driver mode in gc tests Reviewed-by: kbarrett
author iignatyev
date Wed, 29 Apr 2020 07:08:31 -0700
parents c1d09ae5c6b6
children 1d06a4620ea1
files test/hotspot/jtreg/gc/TestAgeOutput.java test/hotspot/jtreg/gc/TestNumWorkerOutput.java test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java test/hotspot/jtreg/gc/arguments/TestHeapFreeRatio.java test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java test/hotspot/jtreg/gc/arguments/TestSurvivorAlignmentInBytesOption.java test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java test/hotspot/jtreg/gc/epsilon/TestDieDefault.java test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java test/hotspot/jtreg/gc/g1/Test2GbHeap.java test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java test/hotspot/jtreg/gc/g1/TestHumongousAllocInitialMark.java test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java test/hotspot/jtreg/gc/g1/TestRemsetLogging.java test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java test/hotspot/jtreg/gc/g1/TestStringDeduplicationAgeThreshold.java test/hotspot/jtreg/gc/g1/TestStringDeduplicationFullGC.java test/hotspot/jtreg/gc/g1/TestStringDeduplicationInterned.java test/hotspot/jtreg/gc/g1/TestStringDeduplicationPrintOptions.java test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableRehash.java test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableResize.java test/hotspot/jtreg/gc/g1/TestStringDeduplicationYoungGC.java test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java test/hotspot/jtreg/gc/logging/TestPrintReferences.java test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java test/hotspot/jtreg/gc/serial/HeapChangeLogging.java test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java test/hotspot/jtreg/gc/startup_warnings/TestG1.java test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java test/hotspot/jtreg/gc/startup_warnings/TestSerialGC.java test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java test/hotspot/jtreg/gc/z/TestSmallHeap.java
diffstat 62 files changed, 110 insertions(+), 110 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/gc/TestAgeOutput.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/TestAgeOutput.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -XX:+UseSerialGC gc.TestAgeOutput UseSerialGC
+ * @run driver gc.TestAgeOutput UseSerialGC
  */
 
 /*
@@ -45,7 +45,7 @@
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -XX:+UseG1GC gc.TestAgeOutput UseG1GC
+ * @run driver gc.TestAgeOutput UseG1GC
  */
 
 import sun.hotspot.WhiteBox;
--- a/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -33,7 +33,7 @@
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -XX:+UseG1GC gc.TestNumWorkerOutput UseG1GC
+ * @run driver gc.TestNumWorkerOutput UseG1GC
  */
 
 import sun.hotspot.WhiteBox;
--- a/test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -36,7 +36,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestCompressedClassFlags
+ * @run driver gc.arguments.TestCompressedClassFlags
  */
 public class TestCompressedClassFlags {
     public static void main(String[] args) throws Exception {
--- a/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestG1ConcMarkStepDurationMillis
+ * @run driver gc.arguments.TestG1ConcMarkStepDurationMillis
  */
 
 import jdk.test.lib.process.ProcessTools;
--- a/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -33,7 +33,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestG1ConcRefinementThreads
+ * @run driver gc.arguments.TestG1ConcRefinementThreads
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java	Wed Apr 29 07:08:31 2020 -0700
@@ -33,7 +33,7 @@
  * @modules java.management/sun.management
  * @library /test/lib
  * @library /
- * @run main gc.arguments.TestG1HeapRegionSize
+ * @run driver gc.arguments.TestG1HeapRegionSize
  */
 
 import java.util.regex.Matcher;
--- a/test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -35,7 +35,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm gc.arguments.TestG1HeapSizeFlags
+ * @run driver gc.arguments.TestG1HeapSizeFlags
  * @author thomas.schatzl@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestHeapFreeRatio.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestHeapFreeRatio.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm gc.arguments.TestHeapFreeRatio
+ * @run driver gc.arguments.TestHeapFreeRatio
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -33,7 +33,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm gc.arguments.TestInitialTenuringThreshold
+ * @run driver gc.arguments.TestInitialTenuringThreshold
  * @author thomas.schatzl@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestMaxNewSize -XX:+UseSerialGC
+ * @run driver gc.arguments.TestMaxNewSize -XX:+UseSerialGC
  * @author thomas.schatzl@oracle.com, jesper.wilhelmsson@oracle.com
  */
 
@@ -49,7 +49,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestMaxNewSize -XX:+UseParallelGC
+ * @run driver gc.arguments.TestMaxNewSize -XX:+UseParallelGC
  * @author thomas.schatzl@oracle.com, jesper.wilhelmsson@oracle.com
  */
 
@@ -64,7 +64,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestMaxNewSize -XX:+UseG1GC
+ * @run driver gc.arguments.TestMaxNewSize -XX:+UseG1GC
  * @author thomas.schatzl@oracle.com, jesper.wilhelmsson@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -36,7 +36,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main gc.arguments.TestMaxRAMFlags
+ * @run driver gc.arguments.TestMaxRAMFlags
  * @author bob.vandette@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java	Wed Apr 29 07:08:31 2020 -0700
@@ -35,7 +35,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm gc.arguments.TestMinInitialErgonomics
+ * @run driver gc.arguments.TestMinInitialErgonomics
  * @author thomas.schatzl@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -33,7 +33,7 @@
  * @requires vm.gc.Serial
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestNewSizeThreadIncrease
+ * @run driver gc.arguments.TestNewSizeThreadIncrease
  */
 
 
--- a/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm gc.arguments.TestObjectTenuringFlags
+ * @run driver gc.arguments.TestObjectTenuringFlags
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -36,7 +36,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm gc.arguments.TestParallelHeapSizeFlags
+ * @run driver gc.arguments.TestParallelHeapSizeFlags
  * @author thomas.schatzl@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -34,7 +34,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm gc.arguments.TestSerialHeapSizeFlags
+ * @run driver gc.arguments.TestSerialHeapSizeFlags
  * @author thomas.schatzl@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java	Wed Apr 29 07:08:31 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm gc.arguments.TestSoftMaxHeapSizeFlag
+ * @run driver gc.arguments.TestSoftMaxHeapSizeFlag
  */
 
 import jdk.test.lib.process.ProcessTools;
--- a/test/hotspot/jtreg/gc/arguments/TestSurvivorAlignmentInBytesOption.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestSurvivorAlignmentInBytesOption.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -39,7 +39,7 @@
  *              | vm.opt.IgnoreUnrecognizedVMOptions == "false")
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.arguments.TestSurvivorAlignmentInBytesOption
+ * @run driver gc.arguments.TestSurvivorAlignmentInBytesOption
  */
 public class TestSurvivorAlignmentInBytesOption {
     public static void main(String args[]) throws Throwable {
--- a/test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
  * @library /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm gc.arguments.TestUnrecognizedVMOptionsHandling
+ * @run driver gc.arguments.TestUnrecognizedVMOptionsHandling
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java	Wed Apr 29 07:08:31 2020 -0700
@@ -29,7 +29,7 @@
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon GC should die on heap exhaustion
  * @library /test/lib
- * @run main gc.epsilon.TestDieDefault
+ * @run driver gc.epsilon.TestDieDefault
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java	Wed Apr 29 07:08:31 2020 -0700
@@ -29,7 +29,7 @@
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon GC should die on heap exhaustion with error handler attached
  * @library /test/lib
- * @run main gc.epsilon.TestDieWithHeapDump
+ * @run driver gc.epsilon.TestDieWithHeapDump
  */
 
 import java.io.*;
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java	Wed Apr 29 07:08:31 2020 -0700
@@ -29,7 +29,7 @@
  * @requires vm.gc.Epsilon & !vm.graal.enabled
  * @summary Epsilon GC should die on heap exhaustion with error handler attached
  * @library /test/lib
- * @run main gc.epsilon.TestDieWithOnError
+ * @run driver gc.epsilon.TestDieWithOnError
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/g1/Test2GbHeap.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/Test2GbHeap.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.Test2GbHeap
+ * @run driver gc.g1.Test2GbHeap
  */
 
 import java.util.ArrayList;
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -33,7 +33,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestEagerReclaimHumongousRegions
+ * @run driver gc.g1.TestEagerReclaimHumongousRegions
  */
 
 import java.util.regex.Pattern;
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java	Wed Apr 29 07:08:31 2020 -0700
@@ -33,7 +33,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestEagerReclaimHumongousRegionsClearMarkBits
+ * @run driver gc.g1.TestEagerReclaimHumongousRegionsClearMarkBits
  */
 
 import java.util.ArrayList;
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -36,7 +36,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestEagerReclaimHumongousRegionsWithRefs
+ * @run driver gc.g1.TestEagerReclaimHumongousRegionsWithRefs
  */
 
 import java.util.regex.Pattern;
--- a/test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -33,7 +33,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestG1TraceEagerReclaimHumongousObjects
+ * @run driver gc.g1.TestG1TraceEagerReclaimHumongousObjects
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/g1/TestHumongousAllocInitialMark.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestHumongousAllocInitialMark.java	Wed Apr 29 07:08:31 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -31,7 +31,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestHumongousAllocInitialMark
+ * @run driver gc.g1.TestHumongousAllocInitialMark
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java	Wed Apr 29 07:08:31 2020 -0700
@@ -32,7 +32,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestMarkStackSizes
+ * @run driver gc.g1.TestMarkStackSizes
  */
 
 import java.util.ArrayList;
--- a/test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestPLABSizeBounds
+ * @run driver gc.g1.TestPLABSizeBounds
  */
 
 import java.util.ArrayList;
--- a/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java	Wed Apr 29 07:08:31 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -31,7 +31,7 @@
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
- * @run main gc.g1.TestPeriodicLogMessages
+ * @run driver gc.g1.TestPeriodicLogMessages
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestPrintRegionRememberedSetInfo
+ * @run driver gc.g1.TestPrintRegionRememberedSetInfo
  * @author thomas.schatzl@oracle.com
  */
 
--- a/test/hotspot/jtreg/gc/g1/TestRemsetLogging.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLogging.java	Wed Apr 29 07:08:31 2020 -0700
@@ -34,7 +34,7 @@
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @summary Verify output of -Xlog:gc+remset*=trace
- * @run main gc.g1.TestRemsetLogging
+ * @run driver gc.g1.TestRemsetLogging
  *
  * Test the output of -Xlog:gc+remset*=trace in conjunction with G1SummarizeRSetStatsPeriod.
  */
--- a/test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java	Wed Apr 29 07:08:31 2020 -0700
@@ -34,7 +34,7 @@
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @summary Verify output of -Xlog:gc+remset*=trace in regards to per-region type output
- * @run main gc.g1.TestRemsetLoggingPerRegion
+ * @run driver gc.g1.TestRemsetLoggingPerRegion
  */
 
 public class TestRemsetLoggingPerRegion {
--- a/test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -33,7 +33,7 @@
  *          java.management/sun.management
  * @summary Ensure that various values of worker threads/concurrent
  * refinement threads do not crash the VM.
- * @run main gc.g1.TestRemsetLoggingThreads
+ * @run driver gc.g1.TestRemsetLoggingThreads
  */
 
 import java.util.regex.Matcher;
--- a/test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -26,14 +26,14 @@
 /**
  * @test
  * @bug 8169703
+ * @key gc regression
  * @summary Verifies that dumping and loading a CDS archive succeeds with AlwaysPreTouch
  * @requires vm.gc.G1
- * @key gc regression
  * @requires vm.cds
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.g1.TestSharedArchiveWithPreTouch
+ * @run driver gc.g1.TestSharedArchiveWithPreTouch
  */
 
 import java.util.List;
--- a/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -37,7 +37,7 @@
  * @requires vm.gc.G1
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
- * @run main gc.g1.TestShrinkDefragmentedHeap
+ * @run driver gc.g1.TestShrinkDefragmentedHeap
  */
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryUsage;
--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationAgeThreshold.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationAgeThreshold.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  *          java.management
- * @run main gc.g1.TestStringDeduplicationAgeThreshold
+ * @run driver gc.g1.TestStringDeduplicationAgeThreshold
  */
 
 public class TestStringDeduplicationAgeThreshold {
--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationFullGC.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationFullGC.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  *          java.management
- * @run main gc.g1.TestStringDeduplicationFullGC
+ * @run driver gc.g1.TestStringDeduplicationFullGC
  */
 
 public class TestStringDeduplicationFullGC {
--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationInterned.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationInterned.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  *          java.management
- * @run main gc.g1.TestStringDeduplicationInterned
+ * @run driver gc.g1.TestStringDeduplicationInterned
  */
 
 public class TestStringDeduplicationInterned {
--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationPrintOptions.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationPrintOptions.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  *          java.management
- * @run main gc.g1.TestStringDeduplicationPrintOptions
+ * @run driver gc.g1.TestStringDeduplicationPrintOptions
  */
 
 public class TestStringDeduplicationPrintOptions {
--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableRehash.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableRehash.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  *          java.management
- * @run main gc.g1.TestStringDeduplicationTableRehash
+ * @run driver gc.g1.TestStringDeduplicationTableRehash
  */
 
 public class TestStringDeduplicationTableRehash {
--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableResize.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableResize.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  *          java.management
- * @run main gc.g1.TestStringDeduplicationTableResize
+ * @run driver gc.g1.TestStringDeduplicationTableResize
  */
 
 public class TestStringDeduplicationTableResize {
--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationYoungGC.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationYoungGC.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  *          java.management
- * @run main gc.g1.TestStringDeduplicationYoungGC
+ * @run driver gc.g1.TestStringDeduplicationYoungGC
  */
 
 public class TestStringDeduplicationYoungGC {
--- a/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -31,7 +31,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.logging.TestDeprecatedPrintFlags
+ * @run driver gc.logging.TestDeprecatedPrintFlags
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.logging.TestPrintReferences
+ * @run driver gc.logging.TestPrintReferences
  */
 
 import java.lang.ref.SoftReference;
--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -35,7 +35,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main gc.metaspace.TestMetaspaceSizeFlags
+ * @run driver gc.metaspace.TestMetaspaceSizeFlags
  */
 public class TestMetaspaceSizeFlags {
   public static final long K = 1024L;
--- a/test/hotspot/jtreg/gc/serial/HeapChangeLogging.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/serial/HeapChangeLogging.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -30,7 +30,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @summary Allocate to get a promotion failure and verify that that heap change logging is present.
- * @run main gc.serial.HeapChangeLogging
+ * @run driver gc.serial.HeapChangeLogging
  */
 
 import java.util.regex.Matcher;
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java	Wed Apr 29 07:08:31 2020 -0700
@@ -28,7 +28,7 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main TestAllocLargeObj
+ * @run driver TestAllocLargeObj
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java	Wed Apr 29 07:08:31 2020 -0700
@@ -28,7 +28,7 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main TestAllocLargerThanHeap
+ * @run driver TestAllocLargerThanHeap
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java	Wed Apr 29 07:08:31 2020 -0700
@@ -28,7 +28,7 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main TestAllocSmallObj
+ * @run driver TestAllocSmallObj
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java	Wed Apr 29 07:08:31 2020 -0700
@@ -28,7 +28,7 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main TestClassLoaderLeak
+ * @run driver TestClassLoaderLeak
  */
 
 import java.util.*;
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java	Wed Apr 29 07:08:31 2020 -0700
@@ -28,7 +28,7 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main TestThreadFailure
+ * @run driver TestThreadFailure
  */
 
 import java.util.*;
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java	Wed Apr 29 07:08:31 2020 -0700
@@ -28,9 +28,9 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main/othervm TestSelectiveBarrierFlags -Xint
- * @run main/othervm TestSelectiveBarrierFlags -Xbatch -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
- * @run main/othervm TestSelectiveBarrierFlags -Xbatch -XX:CompileThreshold=100 -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers
+ * @run driver TestSelectiveBarrierFlags -Xint
+ * @run driver TestSelectiveBarrierFlags -Xbatch -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
+ * @run driver TestSelectiveBarrierFlags -Xbatch -XX:CompileThreshold=100 -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers
  */
 
 import java.util.*;
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	Wed Apr 29 07:08:31 2020 -0700
@@ -27,7 +27,7 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main/othervm TestWrongBarrierDisable
+ * @run driver TestWrongBarrierDisable
  */
 
 import java.util.*;
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java	Wed Apr 29 07:08:31 2020 -0700
@@ -27,7 +27,7 @@
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
  * @library /test/lib
- * @run main/othervm TestWrongBarrierEnable
+ * @run driver TestWrongBarrierEnable
  */
 
 import java.util.*;
--- a/test/hotspot/jtreg/gc/startup_warnings/TestG1.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/startup_warnings/TestG1.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
-* @run main gc.startup_warnings.TestG1
+* @run driver gc.startup_warnings.TestG1
 */
 
 import jdk.test.lib.process.ProcessTools;
--- a/test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -32,7 +32,7 @@
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
-* @run main gc.startup_warnings.TestParallelGC
+* @run driver gc.startup_warnings.TestParallelGC
 */
 
 import jdk.test.lib.process.ProcessTools;
--- a/test/hotspot/jtreg/gc/startup_warnings/TestSerialGC.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/startup_warnings/TestSerialGC.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -31,7 +31,7 @@
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
-* @run main gc.startup_warnings.TestSerialGC
+* @run driver gc.startup_warnings.TestSerialGC
 */
 
 import jdk.test.lib.process.ProcessTools;
--- a/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java	Wed Apr 29 07:08:31 2020 -0700
@@ -32,7 +32,7 @@
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
-* @run main gc.startup_warnings.TestShenandoah
+* @run driver gc.startup_warnings.TestShenandoah
 */
 
 import jdk.test.lib.process.ProcessTools;
--- a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java	Wed Apr 29 07:08:31 2020 -0700
@@ -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
@@ -31,10 +31,10 @@
  * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- * @run main/othervm gc.stress.TestReclaimStringsLeaksMemory
- * @run main/othervm gc.stress.TestReclaimStringsLeaksMemory -XX:+UseSerialGC
- * @run main/othervm gc.stress.TestReclaimStringsLeaksMemory -XX:+UseParallelGC
- * @run main/othervm gc.stress.TestReclaimStringsLeaksMemory -XX:+UseG1GC
+ * @run driver gc.stress.TestReclaimStringsLeaksMemory
+ * @run driver gc.stress.TestReclaimStringsLeaksMemory -XX:+UseSerialGC
+ * @run driver gc.stress.TestReclaimStringsLeaksMemory -XX:+UseParallelGC
+ * @run driver gc.stress.TestReclaimStringsLeaksMemory -XX:+UseG1GC
  */
 
 import java.util.Arrays;
--- a/test/hotspot/jtreg/gc/z/TestSmallHeap.java	Wed Apr 29 07:08:31 2020 -0700
+++ b/test/hotspot/jtreg/gc/z/TestSmallHeap.java	Wed Apr 29 07:08:31 2020 -0700
@@ -28,7 +28,7 @@
  * @requires vm.gc.Z & !vm.graal.enabled
  * @summary Test ZGC with small heaps
  * @library / /test/lib
- * @run main/othervm gc.z.TestSmallHeap 8M 16M 32M 64M 128M 256M 512M 1024M
+ * @run driver gc.z.TestSmallHeap 8M 16M 32M 64M 128M 256M 512M 1024M
  */
 
 import jdk.test.lib.process.ProcessTools;