changeset 48791:6e079ff6c83c

8186635: ClassFileInstaller should be run as a driver Reviewed-by: dholmes
author iignatyev
date Wed, 17 Jan 2018 21:44:44 -0800
parents 423faefc77df
children d2920683b2ea
files test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java test/hotspot/jtreg/compiler/aot/RecompilationTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java test/hotspot/jtreg/gc/TestAgeOutput.java test/hotspot/jtreg/gc/TestNumWorkerOutput.java test/hotspot/jtreg/gc/TestSmallHeap.java test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java test/hotspot/jtreg/gc/g1/TestGCLogMessages.java test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java test/hotspot/jtreg/gc/g1/TestNoEagerReclaimOfHumongousRegions.java test/hotspot/jtreg/gc/g1/TestPLABOutput.java test/hotspot/jtreg/gc/g1/TestRegionLivenessPrint.java test/hotspot/jtreg/gc/g1/TestRemsetLogging.java test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java test/hotspot/jtreg/gc/g1/TestVerifyGCType.java test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java test/hotspot/jtreg/gc/g1/plab/TestPLABResize.java test/hotspot/jtreg/gc/metaspace/TestCapacityUntilGCWrapAround.java test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java test/hotspot/jtreg/gc/whitebox/TestConcMarkCycleWB.java test/hotspot/jtreg/gc/whitebox/TestWBGC.java test/hotspot/jtreg/runtime/8026365/InvokeSpecialAnonTest.java test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java test/hotspot/jtreg/runtime/NMT/ChangeTrackingLevel.java test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java test/hotspot/jtreg/runtime/NMT/MallocSiteHashOverflow.java test/hotspot/jtreg/runtime/NMT/MallocStressTest.java test/hotspot/jtreg/runtime/NMT/MallocTestType.java test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java test/hotspot/jtreg/runtime/NMT/ReleaseCommittedMemory.java test/hotspot/jtreg/runtime/NMT/ReleaseNoCommit.java test/hotspot/jtreg/runtime/NMT/SummarySanityCheck.java test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java test/hotspot/jtreg/runtime/NMT/ThreadedVirtualAllocTestType.java test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitUncommitRecommit.java test/hotspot/jtreg/runtime/NMT/VirtualAllocTestType.java test/hotspot/jtreg/runtime/RedefineObject/TestRedefineObject.java test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency3.java test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency4.java test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java test/hotspot/jtreg/runtime/SharedArchiveFile/SpaceUtilizationCheck.java test/hotspot/jtreg/runtime/appcds/ClassLoaderTest.java test/hotspot/jtreg/runtime/appcds/HelloExtTest.java test/hotspot/jtreg/runtime/appcds/JvmtiAddPath.java test/hotspot/jtreg/runtime/appcds/MismatchedUseAppCDS.java test/hotspot/jtreg/runtime/appcds/MultiProcessSharing.java test/hotspot/jtreg/runtime/appcds/RewriteBytecodesTest.java test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferences.java test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressTest.java test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java test/hotspot/jtreg/runtime/appcds/customLoader/LoaderSegregationTest.java test/hotspot/jtreg/runtime/appcds/customLoader/SameNameInTwoLoadersTest.java test/hotspot/jtreg/runtime/appcds/customLoader/UnintendedLoadersTest.java test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java test/hotspot/jtreg/runtime/handshake/HandshakeWalkExitTest.java test/hotspot/jtreg/runtime/handshake/HandshakeWalkOneExitTest.java test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackFallbackTest.java test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackTest.java test/hotspot/jtreg/runtime/interned/SanityTest.java test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java test/hotspot/jtreg/runtime/memory/ReadVMPageSize.java test/hotspot/jtreg/runtime/memory/ReserveMemory.java test/hotspot/jtreg/runtime/memory/RunUnitTestsConcurrently.java test/hotspot/jtreg/runtime/memory/StressVirtualSpaceResize.java test/hotspot/jtreg/runtime/modules/AccessCheckAllUnnamed.java test/hotspot/jtreg/runtime/modules/AccessCheckExp.java test/hotspot/jtreg/runtime/modules/AccessCheckJavaBase.java test/hotspot/jtreg/runtime/modules/AccessCheckOpen.java test/hotspot/jtreg/runtime/modules/AccessCheckRead.java test/hotspot/jtreg/runtime/modules/AccessCheckSuper.java test/hotspot/jtreg/runtime/modules/AccessCheckUnnamed.java test/hotspot/jtreg/runtime/modules/AccessCheckWorks.java test/hotspot/jtreg/runtime/modules/CCE_module_msg.java test/hotspot/jtreg/runtime/modules/ExportTwice.java test/hotspot/jtreg/runtime/modules/JVMAddModuleExportToAllUnnamed.java test/hotspot/jtreg/runtime/modules/JVMAddModuleExports.java test/hotspot/jtreg/runtime/modules/JVMAddModuleExportsToAll.java test/hotspot/jtreg/runtime/modules/JVMAddReadsModule.java test/hotspot/jtreg/runtime/modules/JVMDefineModule.java test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java test/hotspot/jtreg/runtime/whitebox/WBStackSize.java test/hotspot/jtreg/sanity/MismatchedWhiteBox/WhiteBox.java test/hotspot/jtreg/sanity/WBApi.java test/hotspot/jtreg/serviceability/ParserTest.java test/hotspot/jtreg/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClass.java test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflow.java test/hotspot/jtreg/testlibrary_tests/TestPlatformIsTieredSupported.java test/hotspot/jtreg/testlibrary_tests/whitebox/BlobSanityTest.java test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/BooleanTest.java test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/DoubleTest.java test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/IntxTest.java test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/SizeTTest.java test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/StringTest.java test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/Uint64Test.java test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/UintxTest.java
diffstat 186 files changed, 194 insertions(+), 194 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.DeoptimizationTest
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname libDeoptimizationTest.so
  *     -class compiler.aot.DeoptimizationTest
--- a/test/hotspot/jtreg/compiler/aot/RecompilationTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/RecompilationTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.RecompilationTest
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname libRecompilationTest1.so
  *     -class compiler.whitebox.SimpleTestCaseHelper
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  *        compiler.calls.common.InvokeDynamicPatcher
  *        compiler.aot.AotCompiler
  * @run main compiler.calls.common.InvokeDynamicPatcher
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeDynamic2AotTest.so
  *      -class compiler.calls.common.InvokeDynamic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  *        compiler.calls.common.InvokeDynamicPatcher
  *        compiler.aot.AotCompiler
  * @run main compiler.calls.common.InvokeDynamicPatcher
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeDynamic2CompiledTest.so
  *      -class compiler.calls.common.InvokeDynamic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  *        compiler.calls.common.InvokeDynamicPatcher
  *        compiler.aot.AotCompiler
  * @run main compiler.calls.common.InvokeDynamicPatcher
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname AotInvokeDynamic2InterpretedTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  *        compiler.calls.common.InvokeDynamicPatcher
  *        compiler.aot.AotCompiler
  * @run main compiler.calls.common.InvokeDynamicPatcher
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeDynamic2NativeTest.so
  *      -class compiler.calls.common.InvokeDynamic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeInterface2AotTest.so
  *      -class compiler.calls.common.InvokeInterface
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname AotInvokeInterface2CompiledTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname AotInvokeInterface2InterpretedTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeInterface2NativeTest.so
  *      -class compiler.calls.common.InvokeInterface
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeSpecial2CompiledTest.so
  *      -class compiler.calls.common.InvokeSpecial
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname AotInvokeSpecial2InterpretedTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeSpecial2NativeTest.so
  *      -class compiler.calls.common.InvokeSpecial
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeStatic2CompiledTest.so
  *      -class compiler.calls.common.InvokeStatic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname AotInvokeStatic2InterpretedTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeStatic2NativeTest.so
  *      -class compiler.calls.common.InvokeStatic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeVirtual2CompiledTest.so
  *      -class compiler.calls.common.InvokeVirtual
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname AotInvokeVirtual2InterpretedTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeVirtual2NativeTest.so
  *      -class compiler.calls.common.InvokeVirtual
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @build compiler.calls.common.InvokeDynamic
  *        compiler.calls.common.InvokeDynamicPatcher
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.calls.common.InvokeDynamicPatcher
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeDynamic2AotTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *      compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname CompiledInvokeInterface2AotTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @build compiler.calls.common.InvokeDynamic
  *        compiler.calls.common.InvokeDynamicPatcher
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.calls.common.InvokeDynamicPatcher
  * @run main compiler.aot.AotCompiler
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname InterpretedInvokeInterface2AotTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname InterpretedInvokeSpecial2AotTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname InterpretedInvokeStatic2AotTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler
  *      -libname InterpretedInvokeVirtual2AotTest.so
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname NativeInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname NativeInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname NativeInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
--- a/test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java	Wed Jan 17 21:44:44 2018 -0800
@@ -26,7 +26,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:+open
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions
  *                   -Xbootclasspath/a:. -XX:+WhiteBoxAPI
  *                   -Xbatch -XX:-TieredCompilation -XX:+AlwaysIncrementalInline
--- a/test/hotspot/jtreg/gc/TestAgeOutput.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/TestAgeOutput.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -XX:+UseSerialGC TestAgeOutput UseSerialGC
  * @run main/othervm -XX:+UseConcMarkSweepGC TestAgeOutput UseConcMarkSweepGC
  * @run main/othervm -XX:+UseG1GC TestAgeOutput UseG1GC
--- a/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -XX:+UseConcMarkSweepGC TestNumWorkerOutput UseConcMarkSweepGC
  * @run main/othervm -XX:+UseG1GC TestNumWorkerOutput UseG1GC
  */
--- a/test/hotspot/jtreg/gc/TestSmallHeap.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/TestSmallHeap.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestSmallHeap
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm TestCMSHeapSizeFlags
  * @author thomas.schatzl@oracle.com
--- a/test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm TestG1HeapSizeFlags
  * @author thomas.schatzl@oracle.com
--- a/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestMinAndInitialSurvivorRatioFlags
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm TestMinInitialErgonomics
  * @author thomas.schatzl@oracle.com
--- a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestNewRatioFlag
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver/timeout=240  TestNewSizeFlags
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm TestParallelHeapSizeFlags
  * @author thomas.schatzl@oracle.com
--- a/test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm TestSerialHeapSizeFlags
  * @author thomas.schatzl@oracle.com
--- a/test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
  * @build TestSmallInitialHeapWithLargePageAndNUMA
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UseHugeTLBFS -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestSmallInitialHeapWithLargePageAndNUMA
 */
 
--- a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestSurvivorRatioFlag
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestTargetSurvivorRatioFlag
  */
 
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseG1GC
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC
--- a/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver TestCMSClassUnloadingEnabledHWM
  * @summary Test that -XX:-CMSClassUnloadingEnabled will trigger a Full GC when more than MetaspaceSize metadata is allocated.
--- a/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  *
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver TestG1ClassUnloadingHWM
  * @summary Test that -XX:-ClassUnloadingWithConcurrentMark will trigger a Full GC when more than MetaspaceSize metadata is allocated.
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base
  * @library /test/lib /
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *    sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -XX:+UseConcMarkSweepGC
  *   -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base
  * @library /test/lib /
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *    sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver TestConcurrentPhaseControlG1
  */
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base
  * @library /test/lib /
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *    sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -XX:+UseG1GC
  *   -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base
  * @library /test/lib /
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *    sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -XX:+UseParallelGC
  *   -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base
  * @library /test/lib /
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *    sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -XX:+UseSerialGC
  *   -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestEagerReclaimHumongousRegionsLog
  */
 
--- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main TestGCLogMessages
  */
 
--- a/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @summary Humongous objects may have references from the code cache
  * @run main TestHumongousCodeCacheRoots
--- a/test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *    sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/native
  *    -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @library /test/lib
  * @requires vm.gc.G1
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+IgnoreUnrecognizedVMOptions -XX:+UseLargePages TestLargePageUseForAuxMemory
  */
--- a/test/hotspot/jtreg/gc/g1/TestNoEagerReclaimOfHumongousRegions.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestNoEagerReclaimOfHumongousRegions.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xlog:gc,gc+humongous=debug -XX:+UseG1GC -XX:MaxTenuringThreshold=0 -XX:G1RSetSparseRegionEntries=32 -XX:G1HeapRegionSize=1m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestNoEagerReclaimOfHumongousRegions
  */
--- a/test/hotspot/jtreg/gc/g1/TestPLABOutput.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestPLABOutput.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestPLABOutput
  */
 
--- a/test/hotspot/jtreg/gc/g1/TestRegionLivenessPrint.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestRegionLivenessPrint.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC -Xmx128M -XX:G1HeapRegionSize=1m -Xlog:gc+liveness=trace TestRegionLivenessPrint
  */
--- a/test/hotspot/jtreg/gc/g1/TestRemsetLogging.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLogging.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @summary Verify output of -Xlog:gc+remset*=trace
  * @run main TestRemsetLogging
--- a/test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @summary Verify output of -Xlog:gc+remset*=trace in regards to per-region type output
  * @run main TestRemsetLoggingPerRegion
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=720 TestShrinkAuxiliaryData00
  */
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=720 TestShrinkAuxiliaryData05
  */
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=720 TestShrinkAuxiliaryData10
  */
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=720 TestShrinkAuxiliaryData15
  */
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
   *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=720 TestShrinkAuxiliaryData20
  */
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=720 TestShrinkAuxiliaryData25
  */
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=720 TestShrinkAuxiliaryData30
  */
--- a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @requires vm.gc.G1
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestVerifyGCType
  */
 
--- a/test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver gc.g1.mixedgc.TestLogging
  */
 
--- a/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/timeout=240 gc.g1.plab.TestPLABPromotion
  */
--- a/test/hotspot/jtreg/gc/g1/plab/TestPLABResize.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/g1/plab/TestPLABResize.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main gc.g1.plab.TestPLABResize
  */
--- a/test/hotspot/jtreg/gc/metaspace/TestCapacityUntilGCWrapAround.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/metaspace/TestCapacityUntilGCWrapAround.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCapacityUntilGCWrapAround
  */
--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm TestMetaspaceCMSCancel
  */
 
--- a/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java	Wed Jan 17 21:44:44 2018 -0800
@@ -39,7 +39,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *   -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=1 -Xlog:gc
--- a/test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java	Wed Jan 17 21:44:44 2018 -0800
@@ -36,7 +36,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=300
  *     -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:NewSize=64m -XX:MaxNewSize=64m
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:NewSize=64m -XX:MaxNewSize=64m
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:NewSize=128m -XX:MaxNewSize=128m
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:NewSize=128m -XX:MaxNewSize=128m
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:NewSize=128m -XX:MaxNewSize=128m
--- a/test/hotspot/jtreg/gc/whitebox/TestConcMarkCycleWB.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/whitebox/TestConcMarkCycleWB.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC TestConcMarkCycleWB
  * @summary Verifies that ConcurrentMarking-related WB works properly
--- a/test/hotspot/jtreg/gc/whitebox/TestWBGC.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/gc/whitebox/TestWBGC.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run driver TestWBGC
  */
 import jdk.test.lib.Asserts;
--- a/test/hotspot/jtreg/runtime/8026365/InvokeSpecialAnonTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/8026365/InvokeSpecialAnonTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @compile -XDignore.symbol.file InvokeSpecialAnonTest.java
- * @run main ClassFileInstaller InvokeSpecialAnonTest AnonTester
+ * @run driver ClassFileInstaller InvokeSpecialAnonTest AnonTester
  * @run main/othervm -Xbootclasspath/a:. -Xverify:all InvokeSpecialAnonTest
  */
 import jdk.internal.org.objectweb.asm.*;
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @library /test/lib /runtime/testlibrary
  * @library classes
  * @build sun.hotspot.WhiteBox test.Empty
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass
  */
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @library /test/lib /runtime/testlibrary
  * @library classes
  * @build sun.hotspot.WhiteBox test.Empty
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader
  */
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @library /test/lib /runtime/testlibrary
  * @library classes
  * @build sun.hotspot.WhiteBox test.Empty
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject
  */
--- a/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @library /test/lib /runtime/testlibrary
  * @library classes
  * @build sun.hotspot.WhiteBox test.Empty
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference
  */
--- a/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @library /runtime/testlibrary /test/lib
  * @library classes
  * @build sun.hotspot.WhiteBox test.Empty
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest
  */
--- a/test/hotspot/jtreg/runtime/NMT/ChangeTrackingLevel.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/ChangeTrackingLevel.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ChangeTrackingLevel
  */
--- a/test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail CommitOverlappingRegions
  */
--- a/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff
  */
 
--- a/test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary JcmdSummaryDiff
  */
 
--- a/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocRoundingReportTest
  *
  */
--- a/test/hotspot/jtreg/runtime/NMT/MallocSiteHashOverflow.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/MallocSiteHashOverflow.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteHashOverflow
  */
 
--- a/test/hotspot/jtreg/runtime/NMT/MallocStressTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/MallocStressTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest
  */
 
--- a/test/hotspot/jtreg/runtime/NMT/MallocTestType.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/MallocTestType.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType
  */
--- a/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTrackingVerify
  *
  */
--- a/test/hotspot/jtreg/runtime/NMT/ReleaseCommittedMemory.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/ReleaseCommittedMemory.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory
  */
--- a/test/hotspot/jtreg/runtime/NMT/ReleaseNoCommit.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/ReleaseNoCommit.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary ReleaseNoCommit
  */
 
--- a/test/hotspot/jtreg/runtime/NMT/SummarySanityCheck.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/SummarySanityCheck.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
  */
--- a/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType
  */
--- a/test/hotspot/jtreg/runtime/NMT/ThreadedVirtualAllocTestType.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/ThreadedVirtualAllocTestType.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType
  */
--- a/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitUncommitRecommit.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitUncommitRecommit.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocCommitUncommitRecommit
  *
  */
--- a/test/hotspot/jtreg/runtime/NMT/VirtualAllocTestType.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/NMT/VirtualAllocTestType.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType
  */
--- a/test/hotspot/jtreg/runtime/RedefineObject/TestRedefineObject.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/RedefineObject/TestRedefineObject.java	Wed Jan 17 21:44:44 2018 -0800
@@ -40,7 +40,7 @@
  *          java.instrument
  *          java.management
  * @build Agent
- * @run main ClassFileInstaller Agent
+ * @run driver ClassFileInstaller Agent
  * @run main TestRedefineObject
  * @run main/othervm -javaagent:agent.jar -Xlog:redefine+class+load=debug,redefine+class+timer=info Agent
  */
--- a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main AssertSafepointCheckConsistency1
  */
--- a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main AssertSafepointCheckConsistency2
  */
--- a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency3.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency3.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main AssertSafepointCheckConsistency3
  */
--- a/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency4.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency4.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main AssertSafepointCheckConsistency4
  */
--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java	Wed Jan 17 21:44:44 2018 -0800
@@ -34,7 +34,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build SharedStringsWb sun.hotspot.WhiteBox
- * @run main ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox
  * @run main SharedStrings
  */
 
--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SpaceUtilizationCheck
  */
--- a/test/hotspot/jtreg/runtime/appcds/ClassLoaderTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/ClassLoaderTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -35,7 +35,7 @@
  * @compile test-classes/ForNameTest.java
  * @compile test-classes/BootClassPathAppendHelper.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ClassLoaderTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/HelloExtTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/HelloExtTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -33,7 +33,7 @@
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @compile test-classes/HelloExt.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main HelloExtTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/JvmtiAddPath.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/JvmtiAddPath.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @compile test-classes/Hello.java
  * @compile test-classes/JvmtiApp.java
  * @run main JvmtiAddPath
--- a/test/hotspot/jtreg/runtime/appcds/MismatchedUseAppCDS.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/MismatchedUseAppCDS.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  *          jdk.jartool/sun.tools.jar
  * @compile test-classes/CheckIfShared.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main MismatchedUseAppCDS
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/MultiProcessSharing.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/MultiProcessSharing.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @compile test-classes/MultiProcClass.java
  * @run main MultiProcessSharing
  */
--- a/test/hotspot/jtreg/runtime/appcds/RewriteBytecodesTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/RewriteBytecodesTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -33,7 +33,7 @@
  *          jdk.jartool/sun.tools.jar
  * @compile test-classes/RewriteBytecodes.java test-classes/Util.java test-classes/Super.java test-classes/Child.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main RewriteBytecodesTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java	Wed Jan 17 21:44:44 2018 -0800
@@ -34,7 +34,7 @@
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @build sun.hotspot.WhiteBox
  * @compile test-classes/Hello.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SharedArchiveConsistency
  */
 import jdk.test.lib.process.OutputAnalyzer;
--- a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferences.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferences.java	Wed Jan 17 21:44:44 2018 -0800
@@ -35,9 +35,9 @@
  * @build sun.hotspot.WhiteBox
  * @compile CheckCachedResolvedReferencesApp.java
  * @compile ../test-classes/Hello.java
- * @run main ClassFileInstaller -jar app.jar CheckCachedResolvedReferencesApp
- * @run main ClassFileInstaller -jar hello.jar Hello
- * @run main ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller -jar app.jar CheckCachedResolvedReferencesApp
+ * @run driver ClassFileInstaller -jar hello.jar Hello
+ * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
  * @run main CheckCachedResolvedReferences
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -34,8 +34,8 @@
  *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile GCStressApp.java
- * @run main ClassFileInstaller -jar gcstress.jar GCStressApp
- * @run main ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller -jar gcstress.jar GCStressApp
+ * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
  * @run main GCStressTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,9 +32,9 @@
  *          java.management
  * @compile test-classes/Hello.java test-classes/CustomLoadee.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller -jar hello.jar Hello
- * @run main ClassFileInstaller -jar hello_custom.jar CustomLoadee
- * @run main ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller -jar hello.jar Hello
+ * @run driver ClassFileInstaller -jar hello_custom.jar CustomLoadee
+ * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
  * @run main HelloCustom
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/customLoader/LoaderSegregationTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/LoaderSegregationTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -40,7 +40,7 @@
  *          test-classes/OnlyUnregistered.java
  *          ../test-classes/Util.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main LoaderSegregationTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/customLoader/SameNameInTwoLoadersTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/SameNameInTwoLoadersTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -37,7 +37,7 @@
  *     test-classes/CustomLoadee3.java
  *     test-classes/SameNameUnrelatedLoaders.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main SameNameInTwoLoadersTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/customLoader/UnintendedLoadersTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/UnintendedLoadersTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -33,7 +33,7 @@
  *          jdk.jartool/sun.tools.jar
  * @compile test-classes/UnintendedLoaders.java test-classes/CustomLoadee.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main UnintendedLoadersTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -34,10 +34,10 @@
  *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox ClassUnloadCommon
  * @compile test-classes/UnloadUnregisteredLoader.java test-classes/CustomLoadee.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ClassFileInstaller ClassUnloadCommon
- * @run main ClassFileInstaller ClassUnloadCommon$1
- * @run main ClassFileInstaller ClassUnloadCommon$TestFailure
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller ClassUnloadCommon
+ * @run driver ClassFileInstaller ClassUnloadCommon$1
+ * @run driver ClassFileInstaller ClassUnloadCommon$TestFailure
  * @run main UnloadUnregisteredLoaderTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  * @modules jdk.jartool/sun.tools.jar
  * @compile ArrayTestHelper.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ArrayTest
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java	Wed Jan 17 21:44:44 2018 -0800
@@ -35,7 +35,7 @@
  *          jdk.jartool/sun.tools.jar
  *          java.management
  * @build sun.hotspot.WhiteBox GCDuringDumpTransformer GCSharedStringsDuringDumpWb
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm/timeout=480 GCSharedStringsDuringDump
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java	Wed Jan 17 21:44:44 2018 -0800
@@ -33,7 +33,7 @@
  * @compile ../../test-classes/java/net/HttpCookie.jasm
  * @compile ../../test-classes/javax/activation/MimeType.jasm
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main DummyClassesInBootClassPath
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java	Wed Jan 17 21:44:44 2018 -0800
@@ -35,7 +35,7 @@
  * @compile ../../test-classes/jdk/dynalink/DynamicLinker.jasm
  * @compile ../../test-classes/com/sun/tools/javac/Main.jasm
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main LimitModsTests
  * @summary AppCDS tests for excluding class in module by using --limit-modules.
  */
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java	Wed Jan 17 21:44:44 2018 -0800
@@ -33,7 +33,7 @@
  * @modules java.management
  *          jdk.jartool/sun.tools.jar
  * @build HelloStringGC sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ExerciseGC
  */
 public class ExerciseGC {
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java	Wed Jan 17 21:44:44 2018 -0800
@@ -35,7 +35,7 @@
  *          jdk.jartool/sun.tools.jar
  * @compile InternStringTest.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main InternSharedString
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java	Wed Jan 17 21:44:44 2018 -0800
@@ -35,7 +35,7 @@
  *          jdk.jartool/sun.tools.jar
  * @compile LockStringTest.java LockStringValueTest.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main LockSharedStrings
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java	Wed Jan 17 21:44:44 2018 -0800
@@ -34,7 +34,7 @@
  * @modules java.management
  *          jdk.jartool/sun.tools.jar
  * @build HelloStringPlus sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main SharedStringsBasicPlus
  */
 
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -34,7 +34,7 @@
  * @modules java.management
  *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox SharedStringsWb
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main SharedStringsWbTest
  */
 
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -37,7 +37,7 @@
  * @requires vm.debug
  * @library /testlibrary /test/lib
  * @build HandshakeTransitionTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/native -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI HandshakeTransitionTest
  */
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeWalkExitTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeWalkExitTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @summary This test tries to stress the handshakes with new and exiting threads
  * @library /testlibrary /test/lib
  * @build HandshakeWalkExitTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI HandshakeWalkExitTest
  */
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeWalkOneExitTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeWalkOneExitTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @summary This test tries to stress the handshakes with new and exiting threads
  * @library /testlibrary /test/lib
  * @build HandshakeWalkOneExitTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI HandshakeWalkOneExitTest
  */
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackFallbackTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackFallbackTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @summary This test the global safepoint fallback path for handshakes
  * @library /testlibrary /test/lib
  * @build HandshakeWalkStackTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-ThreadLocalHandshakes HandshakeWalkStackTest
  */
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -26,7 +26,7 @@
  * @test HandshakeWalkStackTest
  * @library /testlibrary /test/lib
  * @build HandshakeWalkStackTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI HandshakeWalkStackTest
  */
--- a/test/hotspot/jtreg/runtime/interned/SanityTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/interned/SanityTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SanityTest
  */
--- a/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ReadFromNoaccessArea
  */
--- a/test/hotspot/jtreg/runtime/memory/ReadVMPageSize.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/memory/ReadVMPageSize.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm  -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI  ReadVMPageSize
  */
 
--- a/test/hotspot/jtreg/runtime/memory/ReserveMemory.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/memory/ReserveMemory.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ReserveMemory
  */
--- a/test/hotspot/jtreg/runtime/memory/RunUnitTestsConcurrently.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/memory/RunUnitTestsConcurrently.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI RunUnitTestsConcurrently 30 15000
  */
--- a/test/hotspot/jtreg/runtime/memory/StressVirtualSpaceResize.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/memory/StressVirtualSpaceResize.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StressVirtualSpaceResize
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckAllUnnamed.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckAllUnnamed.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckAllUnnamed
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckExp.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckExp.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckExp
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckJavaBase.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckJavaBase.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @compile p2/c2.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckJavaBase
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckOpen.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckOpen.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckOpen
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckRead.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckRead.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckRead
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckSuper.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckSuper.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @compile p3/c3.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckSuper
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckUnnamed.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckUnnamed.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckUnnamed
  */
--- a/test/hotspot/jtreg/runtime/modules/AccessCheckWorks.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheckWorks.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckWorks
  */
--- a/test/hotspot/jtreg/runtime/modules/CCE_module_msg.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/CCE_module_msg.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @compile p4/c4.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI CCE_module_msg
  */
--- a/test/hotspot/jtreg/runtime/modules/ExportTwice.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/ExportTwice.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ExportTwice
  */
--- a/test/hotspot/jtreg/runtime/modules/JVMAddModuleExportToAllUnnamed.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/JVMAddModuleExportToAllUnnamed.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @compile p2/c2.java
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @compile/module=java.base java/lang/ModuleHelper.java
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI JVMAddModuleExportToAllUnnamed
--- a/test/hotspot/jtreg/runtime/modules/JVMAddModuleExports.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/JVMAddModuleExports.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib ..
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI JVMAddModuleExports
  */
--- a/test/hotspot/jtreg/runtime/modules/JVMAddModuleExportsToAll.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/JVMAddModuleExportsToAll.java	Wed Jan 17 21:44:44 2018 -0800
@@ -31,7 +31,7 @@
  * @compile p1/c1.java
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI JVMAddModuleExportsToAll
  */
--- a/test/hotspot/jtreg/runtime/modules/JVMAddReadsModule.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/JVMAddReadsModule.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib ..
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI JVMAddReadsModule
  */
--- a/test/hotspot/jtreg/runtime/modules/JVMDefineModule.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/JVMDefineModule.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib ..
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI JVMDefineModule
  */
--- a/test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @library /test/lib ..
  * @build sun.hotspot.WhiteBox
  * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx64m -Xmx64m LoadUnloadModuleStress 15000
  */
--- a/test/hotspot/jtreg/runtime/whitebox/WBStackSize.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/runtime/whitebox/WBStackSize.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xss512k WBStackSize
  */
--- a/test/hotspot/jtreg/sanity/MismatchedWhiteBox/WhiteBox.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/sanity/MismatchedWhiteBox/WhiteBox.java	Wed Jan 17 21:44:44 2018 -0800
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile WhiteBox.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-CheckIntrinsics sun.hotspot.WhiteBox
  */
 
--- a/test/hotspot/jtreg/sanity/WBApi.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/sanity/WBApi.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi
  */
--- a/test/hotspot/jtreg/serviceability/ParserTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/ParserTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
  */
--- a/test/hotspot/jtreg/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -43,7 +43,7 @@
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @build SimpleJvmtiAgent
- * @run main ClassFileInstaller SimpleJvmtiAgent
+ * @run driver ClassFileInstaller SimpleJvmtiAgent
  * @run testng/othervm LoadAgentDcmdTest
  */
 public class LoadAgentDcmdTest {
--- a/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClass.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClass.java	Wed Jan 17 21:44:44 2018 -0800
@@ -37,7 +37,7 @@
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @build GetObjectSizeClassAgent
- * @run main ClassFileInstaller GetObjectSizeClassAgent
+ * @run driver ClassFileInstaller GetObjectSizeClassAgent
  * @run main GetObjectSizeClass
  */
 public class GetObjectSizeClass {
--- a/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflow.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflow.java	Wed Jan 17 21:44:44 2018 -0800
@@ -38,7 +38,7 @@
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @build GetObjectSizeOverflowAgent
- * @run main ClassFileInstaller GetObjectSizeOverflowAgent
+ * @run driver ClassFileInstaller GetObjectSizeOverflowAgent
  * @run main GetObjectSizeOverflow
  */
 public class GetObjectSizeOverflow {
--- a/test/hotspot/jtreg/testlibrary_tests/TestPlatformIsTieredSupported.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/TestPlatformIsTieredSupported.java	Wed Jan 17 21:44:44 2018 -0800
@@ -32,7 +32,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:+TieredCompilation
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/BlobSanityTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/BlobSanityTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BlobSanityTest
  * @summary sanity testing of allocateCodeBlob, freeCodeBlob and getCodeBlob
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/BooleanTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/BooleanTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -30,7 +30,7 @@
  *          java.management/sun.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BooleanTest
  * @summary testing of WB::set/getBooleanVMFlag()
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/DoubleTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/DoubleTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DoubleTest
  * @summary testing of WB::set/getDoubleVMFlag()
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/IntxTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/IntxTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xint -XX:-ProfileInterpreter IntxTest
  * @summary testing of WB::set/getIntxVMFlag()
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/SizeTTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/SizeTTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions SizeTTest
  * @summary testing of WB::set/getSizeTVMFlag()
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/StringTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/StringTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StringTest
  * @summary testing of WB::set/getStringVMFlag()
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/Uint64Test.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/Uint64Test.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI Uint64Test
  * @summary testing of WB::set/getUint64VMFlag()
--- a/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/UintxTest.java	Wed Jan 17 16:49:43 2018 -0800
+++ b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/UintxTest.java	Wed Jan 17 21:44:44 2018 -0800
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UintxTest
  * @summary testing of WB::set/getUintxVMFlag()