changeset 60692:6abdfb11f342

8251127: clean up FileInstaller $test.src $cwd in remaining vmTestbase_vm_compiler tests Reviewed-by: kvn
author iignatyev
date Wed, 26 Aug 2020 17:06:15 -0700
parents 15a997f5207a
children ad2712ca4a35
files test/hotspot/jtreg/TEST.quick-groups test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.java test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java test/hotspot/jtreg/vmTestbase/jit/series/series.java test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.java test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.java test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java test/hotspot/jtreg/vmTestbase/jit/t/t108/TestDescription.java test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.gold test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java test/hotspot/jtreg/vmTestbase/jit/t/t109/TestDescription.java test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.gold test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java test/hotspot/jtreg/vmTestbase/jit/t/t110/TestDescription.java test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.gold test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java test/hotspot/jtreg/vmTestbase/jit/t/t111/TestDescription.java test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.gold test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java test/hotspot/jtreg/vmTestbase/jit/t/t112/TestDescription.java test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.gold test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java test/hotspot/jtreg/vmTestbase/jit/t/t113/TestDescription.java test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.gold test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java
diffstat 112 files changed, 193 insertions(+), 428 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/TEST.quick-groups	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/TEST.quick-groups	Wed Aug 26 17:06:15 2020 -0700
@@ -1778,12 +1778,12 @@
   vmTestbase/jit/t/t105/t105.java \
   vmTestbase/jit/t/t106/t106.java \
   vmTestbase/jit/t/t107/t107.java \
-  vmTestbase/jit/t/t108/TestDescription.java \
-  vmTestbase/jit/t/t109/TestDescription.java \
-  vmTestbase/jit/t/t110/TestDescription.java \
-  vmTestbase/jit/t/t111/TestDescription.java \
-  vmTestbase/jit/t/t112/TestDescription.java \
-  vmTestbase/jit/t/t113/TestDescription.java \
+  vmTestbase/jit/t/t108/t108.java \
+  vmTestbase/jit/t/t109/t109.java \
+  vmTestbase/jit/t/t110/t110.java \
+  vmTestbase/jit/t/t111/t111.java \
+  vmTestbase/jit/t/t112/t112.java \
+  vmTestbase/jit/t/t113/t113.java \
   vmTestbase/jit/tiered/Test.java \
   vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java \
   vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java \
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/FPCompare/TestFPBinop/TestFPBinop.java	Wed Aug 26 17:06:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.FloatingPoint.FPCompare.TestFPBinop.TestFPBinop
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.collapse.collapse
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.inline.inline003.inline003
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.inline.inline004.inline004
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java	Wed Aug 26 17:06:15 2020 -0700
@@ -33,7 +33,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.inline.inline007.inline007
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/series/series.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/series/series.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.series.series
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t001.t001
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t002.t002
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t003.t003
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t004.t004
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t005.t005
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t006.t006
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t011.t011
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t013.t013
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t015.t015
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t016.t016
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t017.t017
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t018.t018
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t019.t019
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t020.t020
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t021.t021
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t022.t022
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t023.t023
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t024.t024
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t025.t025
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t027.t027
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t028.t028
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t029.t029
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t030.t030
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t031.t031
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t032.t032
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t033.t033
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t034.t034
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t035.t035
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t036.t036
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t037.t037
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t038.t038
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t039.t039
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t040.t040
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t042.t042
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t043.t043
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t046.t046
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t047.t047
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t048.t048
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t049.t049
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t051.t051
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t052.t052
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t053.t053
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t054.t054
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t055.t055
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t056.t056
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t057.t057
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t058.t058
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t059.t059
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t060.t060
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t061.t061
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t062.t062
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t063.t063
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t064.t064
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t065.t065
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t067.t067
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t068.t068
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t069.t069
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t070.t070
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t071.t071
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t072.t072
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t073.t073
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t074.t074
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t075.t075
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t076.t076
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t077.t077
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t078.t078
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t079.t079
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t080.t080
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t081.t081
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t086.t086
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t087/t087.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build ExecDriver
  *
  * @comment build all dependencies
@@ -46,6 +45,7 @@
  * @comment run the test
  * @run driver ExecDriver --java
  *      -cp .${path.separator}${test.class.path}
+ *      -Dtest.src=${test.src}
  *      jit.t.t087.t087
  *      -WorkDir ./jit/t/t087
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t088/t088.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build ExecDriver
  *
  * @comment build all dependencies
@@ -46,6 +45,7 @@
  * @comment run the test
  * @run driver ExecDriver --java
  *      -cp .${path.separator}${test.class.path}
+ *      -Dtest.src=${test.src}
  *      jit.t.t088.t088
  *      -WorkDir ./jit/t/t088
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t091.t091
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t093.t093
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t094.t094
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t095.t095
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t096.t096
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t098.t098
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t099.t099
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t100.t100
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t101.t101
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t102.t102
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t103.t103
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t104.t104
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t105.t105
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t106.t106
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java	Wed Aug 26 17:06:15 2020 -0700
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.t.t107.t107
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t108/TestDescription.java	Tue Aug 25 12:46:18 2020 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- *
- * @summary converted from VM Testbase jit/t/t108.
- * VM Testbase keywords: [jit, quick]
- * VM Testbase readme:
- * Clone of t083.  The pass file changed in JDK 1.2.
- *
- * @library /vmTestbase
- *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
- * @build jit.t.t108.t108
- * @run driver ExecDriver --java jit.t.t108.t108
- */
-
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.gold	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.gold	Wed Aug 26 17:06:15 2020 -0700
@@ -1,3 +1,3 @@
 java.lang.Throwable
-        at jit.t.t108.t108.doit(t108.java:51)
-        at jit.t.t108.t108.main(t108.java:40)
+        at jit.t.t108.t108.doit(t108.java:65)
+        at jit.t.t108.t108.main(t108.java:55)
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java	Wed Aug 26 17:06:15 2020 -0700
@@ -20,34 +20,48 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/t/t108.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t083.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @build jit.t.t108.t108
+ * @comment ExecDriver is used so golden file won't depend on jtreg
+ * @run driver ExecDriver --java
+ *      -Dtest.src=${test.src}
+ *      jit.t.t108.t108
+ */
+
 package jit.t.t108;
 
 import java.io.*;
-import nsk.share.TestFailure;
 import nsk.share.GoldChecker;
 
 // THIS TEST IS LINE NUMBER SENSITIVE
 
 // Uncaught exception, one jit'd frame on the stack.
 
-public class t108
-{
+public class t108 {
     public static final GoldChecker goldChecker = new GoldChecker( "t108" );
 
-    public static void main(String argv[])
-    {
+    public static void main(String[] argv) {
         try {
             doit();
         } catch (Throwable t) {
-                StringWriter sr = new StringWriter();
-                t.printStackTrace(new PrintWriter(sr));
-                t108.goldChecker.print(sr.toString().replace("\t", "        "));
+            StringWriter sr = new StringWriter();
+            t.printStackTrace(new PrintWriter(sr));
+            t108.goldChecker.print(sr.toString().replace("\t", "        "));
         }
         t108.goldChecker.check();
     }
 
-    static void doit() throws Throwable
-    {
+    static void doit() throws Throwable {
         Throwable t = new Throwable();
         throw t;
     }
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t109/TestDescription.java	Tue Aug 25 12:46:18 2020 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- *
- * @summary converted from VM Testbase jit/t/t109.
- * VM Testbase keywords: [jit, quick]
- * VM Testbase readme:
- * Clone of t084.  The pass file changed in JDK 1.2.
- *
- * @library /vmTestbase
- *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
- * @build jit.t.t109.t109
- * @run driver ExecDriver --java jit.t.t109.t109
- */
-
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.gold	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.gold	Wed Aug 26 17:06:15 2020 -0700
@@ -1,3 +1,3 @@
 java.lang.ArithmeticException: / by zero
-        at jit.t.t109.t109.doit(t109.java:53)
-        at jit.t.t109.t109.main(t109.java:40)
+        at jit.t.t109.t109.doit(t109.java:69)
+        at jit.t.t109.t109.main(t109.java:57)
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java	Wed Aug 26 17:06:15 2020 -0700
@@ -20,34 +20,50 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/t/t109.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t084.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @build jit.t.t109.t109
+ * @comment ExecDriver is used so golden file won't depend on jtreg
+ * @run driver ExecDriver --java
+ *      -Dtest.src=${test.src}
+ *      jit.t.t109.t109
+ */
+
 package jit.t.t109;
 
-import java.io.*;
-import nsk.share.TestFailure;
 import nsk.share.GoldChecker;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 // THIS TEST IS LINE NUMBER SENSITIVE
 
 // Uncaught exception, one jit'd frame on the stack, implicit exception.
 
-public class t109
-{
-    public static final GoldChecker goldChecker = new GoldChecker( "t109" );
+public class t109 {
+    public static final GoldChecker goldChecker = new GoldChecker("t109");
 
-    public static void main(String argv[])
-    {
+    public static void main(String[] argv) {
         try {
             doit();
         } catch (Throwable t) {
-                StringWriter sr = new StringWriter();
-                t.printStackTrace(new PrintWriter(sr));
-                t109.goldChecker.print(sr.toString().replace("\t", "        "));
+            StringWriter sr = new StringWriter();
+            t.printStackTrace(new PrintWriter(sr));
+            t109.goldChecker.print(sr.toString().replace("\t", "        "));
         }
         t109.goldChecker.check();
     }
 
-    public static void doit()
-    {
+    public static void doit() {
         int i = 0;
         int j = 39;
         j /= i;
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t110/TestDescription.java	Tue Aug 25 12:46:18 2020 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- *
- * @summary converted from VM Testbase jit/t/t110.
- * VM Testbase keywords: [jit, quick]
- * VM Testbase readme:
- * Clone of t085.  The pass file changed in JDK 1.2.
- *
- * @library /vmTestbase
- *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
- * @build jit.t.t110.t110
- * @run driver ExecDriver --java jit.t.t110.t110
- */
-
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.gold	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.gold	Wed Aug 26 17:06:15 2020 -0700
@@ -1,3 +1,3 @@
 java.lang.ArithmeticException: / by zero
-        at jit.t.t110.t110.doit(t110.java:53)
-        at jit.t.t110.t110.main(t110.java:40)
+        at jit.t.t110.t110.doit(t110.java:69)
+        at jit.t.t110.t110.main(t110.java:57)
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java	Wed Aug 26 17:06:15 2020 -0700
@@ -20,34 +20,50 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/t/t110.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t085.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @build jit.t.t110.t110
+ * @comment ExecDriver is used so golden file won't depend on jtreg
+ * @run driver ExecDriver --java
+ *      -Dtest.src=${test.src}
+ *      jit.t.t110.t110
+ */
+
 package jit.t.t110;
 
-import java.io.*;
-import nsk.share.TestFailure;
 import nsk.share.GoldChecker;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 // THIS TEST IS LINE NUMBER SENSITIVE
 
 // Uncaught exception, one jit'd frame on the stack, implicit exception.
 
-public class t110
-{
-    public static final GoldChecker goldChecker = new GoldChecker( "t110" );
+public class t110 {
+    public static final GoldChecker goldChecker = new GoldChecker("t110");
 
-    public static void main(String argv[])
-    {
+    public static void main(String[] argv) {
         try {
             doit();
-        } catch(Throwable t) {
-                StringWriter sr = new StringWriter();
-                t.printStackTrace(new PrintWriter(sr));
-                t110.goldChecker.print(sr.toString().replace("\t", "        "));
+        } catch (Throwable t) {
+            StringWriter sr = new StringWriter();
+            t.printStackTrace(new PrintWriter(sr));
+            t110.goldChecker.print(sr.toString().replace("\t", "        "));
         }
         t110.goldChecker.check();
     }
 
-    static void doit()
-    {
+    static void doit() {
         int i = 0;
         int j = 39;
         j /= i;
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t111/TestDescription.java	Tue Aug 25 12:46:18 2020 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- *
- * @summary converted from VM Testbase jit/t/t111.
- * VM Testbase keywords: [jit, quick]
- * VM Testbase readme:
- * Clone of t089.  The pass file changed in JDK 1.2.
- *
- * @library /vmTestbase
- *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
- * @build jit.t.t111.t111
- * @run driver ExecDriver --java jit.t.t111.t111
- */
-
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.gold	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.gold	Wed Aug 26 17:06:15 2020 -0700
@@ -1,3 +1,3 @@
 java.lang.Throwable
-        at jit.t.t111.t111.doit(t111.java:52)
-        at jit.t.t111.t111.main(t111.java:40)
+        at jit.t.t111.t111.doit(t111.java:68)
+        at jit.t.t111.t111.main(t111.java:57)
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java	Wed Aug 26 17:06:15 2020 -0700
@@ -20,34 +20,50 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/t/t111.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t089.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @build jit.t.t111.t111
+ * @comment ExecDriver is used so golden file won't depend on jtreg
+ * @run driver ExecDriver --java
+ *      -Dtest.src=${test.src}
+ *      jit.t.t111.t111
+ */
+
 package jit.t.t111;
 
-import java.io.*;
-import nsk.share.TestFailure;
 import nsk.share.GoldChecker;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 // THIS TEST IS LINE NUMBER SENSITIVE
 
 // Uncaught exception, one jit'd frame on the stack.
 
-public class t111
-{
-    public static final GoldChecker goldChecker = new GoldChecker( "t111" );
+public class t111 {
+    public static final GoldChecker goldChecker = new GoldChecker("t111");
 
-    public static void main(String argv[])
-    {
+    public static void main(String[] argv) {
         try {
             doit();
         } catch (Throwable t) {
-                StringWriter sr = new StringWriter();
-                t.printStackTrace(new PrintWriter(sr));
-                t111.goldChecker.print(sr.toString().replace("\t", "        "));
+            StringWriter sr = new StringWriter();
+            t.printStackTrace(new PrintWriter(sr));
+            t111.goldChecker.print(sr.toString().replace("\t", "        "));
         }
         t111.goldChecker.check();
     }
 
-    public static void doit() throws Throwable
-    {
+    public static void doit() throws Throwable {
         Throwable t = new Throwable();
         t.fillInStackTrace();
         throw t;
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t112/TestDescription.java	Tue Aug 25 12:46:18 2020 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- *
- * @summary converted from VM Testbase jit/t/t112.
- * VM Testbase keywords: [jit, quick]
- * VM Testbase readme:
- * Clone of t090.  The pass file changed in JDK 1.2.
- *
- * @library /vmTestbase
- *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
- * @build jit.t.t112.t112
- * @run driver ExecDriver --java jit.t.t112.t112
- */
-
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.gold	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.gold	Wed Aug 26 17:06:15 2020 -0700
@@ -1,3 +1,3 @@
 java.lang.Throwable
-        at jit.t.t112.t112.doit(t112.java:52)
-        at jit.t.t112.t112.main(t112.java:40)
+        at jit.t.t112.t112.doit(t112.java:68)
+        at jit.t.t112.t112.main(t112.java:57)
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java	Wed Aug 26 17:06:15 2020 -0700
@@ -20,34 +20,50 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/t/t112.
+ * VM Testbase keywords: [jit, quick]
+ * VM Testbase readme:
+ * Clone of t090.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @build jit.t.t112.t112
+ * @comment ExecDriver is used so golden file won't depend on jtreg
+ * @run driver ExecDriver --java
+ *      -Dtest.src=${test.src}
+ *      jit.t.t112.t112
+ */
+
 package jit.t.t112;
 
-import java.io.*;
-import nsk.share.TestFailure;
 import nsk.share.GoldChecker;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 // THIS TEST IS LINE NUMBER SENSITIVE
 
 // Uncaught exception, one jit'd frame on the stack.
 
-public class t112
-{
-    public static final GoldChecker goldChecker = new GoldChecker( "t112" );
+public class t112 {
+    public static final GoldChecker goldChecker = new GoldChecker("t112");
 
-    public static void main(String argv[])
-    {
+    public static void main(String[] argv) {
         try {
             doit();
         } catch (Throwable t) {
-                StringWriter sr = new StringWriter();
-                t.printStackTrace(new PrintWriter(sr));
-                t112.goldChecker.print(sr.toString().replace("\t", "        "));
+            StringWriter sr = new StringWriter();
+            t.printStackTrace(new PrintWriter(sr));
+            t112.goldChecker.print(sr.toString().replace("\t", "        "));
         }
         t112.goldChecker.check();
     }
 
-    static void doit() throws Throwable
-    {
+    static void doit() throws Throwable {
         Throwable t = new Throwable();
         t.fillInStackTrace();
         throw t;
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t113/TestDescription.java	Tue Aug 25 12:46:18 2020 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- *
- * @summary converted from VM Testbase jit/t/t113.
- * VM Testbase keywords: [jit, quick, vm6]
- * VM Testbase readme:
- * Clone of t097.  The pass file changed in JDK 1.2.
- *
- * @library /vmTestbase
- *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
- * @build jit.t.t113.t113
- * @run driver ExecDriver --java jit.t.t113.t113
- */
-
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.gold	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.gold	Wed Aug 26 17:06:15 2020 -0700
@@ -1,2 +1,2 @@
 java.lang.ClassCastException: class jit.t.t113.kid1 cannot be cast to class jit.t.t113.kid2 (jit.t.t113.kid1 and jit.t.t113.kid2 are in unnamed module of loader 'app')
-        at jit.t.t113.t113.main(t113.java:59)
+        at jit.t.t113.t113.main(t113.java:72)
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java	Tue Aug 25 12:46:18 2020 +0800
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java	Wed Aug 26 17:06:15 2020 -0700
@@ -20,53 +20,65 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * @test
+ *
+ * @summary converted from VM Testbase jit/t/t113.
+ * VM Testbase keywords: [jit, quick, vm6]
+ * VM Testbase readme:
+ * Clone of t097.  The pass file changed in JDK 1.2.
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @build jit.t.t113.t113
+ * @comment ExecDriver is used so golden file won't depend on jtreg
+ * @run driver ExecDriver --java
+ *      -Dtest.src=${test.src}
+ *      jit.t.t113.t113
+ */
+
 package jit.t.t113;
 
-import java.io.*;
-import nsk.share.TestFailure;
 import nsk.share.GoldChecker;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 // THIS TEST IS LINE NUMBER SENSITIVE
 
 // Exception thrown by checkcast.
 
-class parent
-{
+class parent {
 }
 
-class kid1 extends parent
-{
+class kid1 extends parent {
     int i;
 }
 
-class kid2 extends parent
-{
+class kid2 extends parent {
     int j;
 }
 
-public class t113
-{
-    public static final GoldChecker goldChecker = new GoldChecker( "t113" );
+public class t113 {
+    public static final GoldChecker goldChecker = new GoldChecker("t113");
 
-    public static void main(String[] argv) throws Throwable
-    {
+    public static void main(String[] argv) throws Throwable {
         parent p;
         kid2 k2;
 
         p = new kid1();
-        try
-        {
+        try {
             k2 = (kid2) p;
+        } catch (Throwable t) {
+            StringWriter sr = new StringWriter();
+            t.printStackTrace(new PrintWriter(sr));
+            // Relaxing the gold checking to allow jigsaw module names
+            // appear in ClassCastException message
+            t113.goldChecker.print(sr.toString().replace("\t", "        ")
+                    .replaceAll(" \\(in module: [ \\w\\.]*\\)", ""));
         }
-        catch(Throwable t)
-        {
-                StringWriter sr = new StringWriter();
-                t.printStackTrace(new PrintWriter(sr));
-                // Relaxing the gold checking to allow jigsaw module names
-                // appear in ClassCastException message
-                t113.goldChecker.print(sr.toString().replace("\t", "        ")
-                        .replaceAll(" \\(in module: [ \\w\\.]*\\)",""));
-        }
+
         t113.goldChecker.check();
     }
 }