Merge

2020-07-14 19:11:16 +00:00 · 2020-07-14 19:11:16 +00:00 · d7c1bb1fb7
commit d7c1bb1fb7
parent 52977fd914 6d201dbba6
929 changed files with 721 additions and 1660 deletions
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,6 @@
 * VM Testbase comments: 8208250
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xms200m
 *      -Xlog:gc+heap=trace,gc:gc.log
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,6 @@
 * VM Testbase comments: 8208250
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xms200m
 *      -Xlog:gc+heap=trace,gc:gc.log
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,6 @@
 * VM Testbase comments: 8208250
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xms200m
 *      -Xlog:gc+heap=trace,gc:gc.log
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_default/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/firstGC_default/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,6 @@
 * VM Testbase comments: 8208250
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xms200m
 *      -Xlog:gc+heap=trace,gc:gc.log
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageLargeComp/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageLargeComp/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,6 @@
 * VM Testbase keywords: [nonconcurrent]
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xms200m
 *      -XX:MetaspaceSize=100m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageLargeMeta/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageLargeMeta/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,6 @@
 * VM Testbase keywords: [nonconcurrent]
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xms200m
 *      -XX:MetaspaceSize=100m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageSmallComp/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageSmallComp/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,6 @@
 * VM Testbase keywords: [nonconcurrent]
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -XX:MaxMetaspaceSize=20M
 *      -XX:MinMetaspaceFreeRatio=10
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageSmallMeta/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/memoryUsageSmallMeta/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,6 @@
 * VM Testbase keywords: [nonconcurrent]
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -XX:MetaspaceSize=10M
 *      -XX:MinMetaspaceFreeRatio=70
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_0_1/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_0_1/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,6 @@
 * @requires vm.gc != "G1" | !vm.opt.final.ClassUnloadingWithConcurrentMark
 * @requires vm.gc != "Z"
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xmx1g
 *      -Xms150m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_10_20/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_10_20/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,6 @@
 * @requires vm.gc != "G1" | !vm.opt.final.ClassUnloadingWithConcurrentMark
 * @requires vm.gc != "Z"
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xmx1g
 *      -Xms150m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_70_80/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_70_80/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,6 @@
 * @requires vm.gc != "G1" | !vm.opt.final.ClassUnloadingWithConcurrentMark
 * @requires vm.gc != "Z"
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xmx1g
 *      -Xms150m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_99_100/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_99_100/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,6 @@
 * @requires vm.gc != "G1" | !vm.opt.final.ClassUnloadingWithConcurrentMark
 * @requires vm.gc != "Z"
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -Xmx1g
 *      -Xms150m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -DrequiresCompressedClassSpace=true
 *      -XX:MaxMetaspaceSize=100m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build metaspace.shrink_grow.ShrinkGrowMultiJVM.ShrinkGrowMultiJVM
 * @run driver metaspace.shrink_grow.ShrinkGrowMultiJVM.ShrinkGrowMultiJVM
 */
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm
 *      -XX:MetaspaceSize=10m
 *      -XX:MaxMetaspaceSize=20m
--- a/test/hotspot/jtreg/vmTestbase/metaspace/staticReferences/StaticReferences.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/staticReferences/StaticReferences.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressDictionary/StressDictionary.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressDictionary/StressDictionary.java
@ -29,7 +29,6 @@
 * VM Testbase keywords: [nonconcurrent, javac]
 *
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @run main/othervm/timeout=420 metaspace.stressDictionary.StressDictionary -stressTime 30
 */

--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java
@ -31,7 +31,6 @@
 *
 * @requires vm.opt.final.ClassUnloading
 * @library /vmTestbase /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox
 * @run main/othervm
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -57,7 +57,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ArrayReference.GetValues.getvalues001
 *        nsk.jdwp.ArrayReference.GetValues.getvalues001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ArrayReference.GetValues.getvalues002
 *        nsk.jdwp.ArrayReference.GetValues.getvalues002a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -56,7 +56,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ArrayReference.Length.length001
 *        nsk.jdwp.ArrayReference.Length.length001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ArrayReference.SetValues.setvalues001
 *        nsk.jdwp.ArrayReference.SetValues.setvalues001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -54,7 +54,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ArrayType.NewInstance.newinstance001
 *        nsk.jdwp.ArrayType.NewInstance.newinstance001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassLoaderReference/VisibleClasses/visibclasses001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -56,7 +56,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ClassLoaderReference.VisibleClasses.visibclasses001
 *        nsk.jdwp.ClassLoaderReference.VisibleClasses.visibclasses001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassObjectReference/ReflectedType/reflectype001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ClassObjectReference.ReflectedType.reflectype001
 *        nsk.jdwp.ClassObjectReference.ReflectedType.reflectype001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/InvokeMethod/invokemeth001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ClassType.InvokeMethod.invokemeth001
 *        nsk.jdwp.ClassType.InvokeMethod.invokemeth001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/NewInstance/newinst001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ClassType.NewInstance.newinst001
 *        nsk.jdwp.ClassType.NewInstance.newinst001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/SetValues/setvalues001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -65,7 +65,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ClassType.SetValues.setvalues001
 *        nsk.jdwp.ClassType.SetValues.setvalues001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ClassType/Superclass/superclass001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -55,7 +55,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ClassType.Superclass.superclass001
 *        nsk.jdwp.ClassType.Superclass.superclass001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/BREAKPOINT/breakpoint001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.BREAKPOINT.breakpoint001
 *        nsk.jdwp.Event.BREAKPOINT.breakpoint001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_PREPARE/clsprepare001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.CLASS_PREPARE.clsprepare001
 *        nsk.jdwp.Event.CLASS_PREPARE.clsprepare001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/CLASS_UNLOAD/clsunload001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -61,7 +61,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.CLASS_UNLOAD.clsunload001
 *        nsk.jdwp.Event.CLASS_UNLOAD.clsunload001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/Composite/composite001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -48,7 +48,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.Composite.composite001
 *        nsk.jdwp.Event.Composite.composite001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -63,7 +63,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.EXCEPTION.exception001
 *        nsk.jdwp.Event.EXCEPTION.exception001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_ACCESS/fldaccess001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -62,7 +62,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.FIELD_ACCESS.fldaccess001
 *        nsk.jdwp.Event.FIELD_ACCESS.fldaccess001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/FIELD_MODIFICATION/fldmodification001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -63,7 +63,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.FIELD_MODIFICATION.fldmodification001
 *        nsk.jdwp.Event.FIELD_MODIFICATION.fldmodification001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_ENTRY/methentry001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.METHOD_ENTRY.methentry001
 *        nsk.jdwp.Event.METHOD_ENTRY.methentry001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/METHOD_EXIT/methexit001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.METHOD_EXIT.methexit001
 *        nsk.jdwp.Event.METHOD_EXIT.methexit001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -62,7 +62,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.SINGLE_STEP.singlestep001
 *        nsk.jdwp.Event.SINGLE_STEP.singlestep001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep002/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -62,7 +62,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.SINGLE_STEP.singlestep002
 *        nsk.jdwp.Event.SINGLE_STEP.singlestep002a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/SINGLE_STEP/singlestep003/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -62,7 +62,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.SINGLE_STEP.singlestep003
 *        nsk.jdwp.Event.SINGLE_STEP.singlestep003a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_DEATH/thrdeath001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.THREAD_DEATH.thrdeath001
 *        nsk.jdwp.Event.THREAD_DEATH.thrdeath001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/THREAD_START/thrstart001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.THREAD_START.thrstart001
 *        nsk.jdwp.Event.THREAD_START.thrstart001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -52,7 +52,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.VM_DEATH.vmdeath001
 *        nsk.jdwp.Event.VM_DEATH.vmdeath001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_DEATH/vmdeath002/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.VM_DEATH.vmdeath002
 *        nsk.jdwp.Event.VM_DEATH.vmdeath002a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/VM_START/vmstart001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -50,7 +50,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Event.VM_START.vmstart001
 *        nsk.jdwp.Event.VM_START.vmstart001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Clear/clear001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -57,7 +57,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.EventRequest.Clear.clear001
 *        nsk.jdwp.EventRequest.Clear.clear001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -55,7 +55,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp001
 *        nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp002/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -49,7 +49,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp002
 *        nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp002a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/ClearAllBreakpoints/clrallbreakp003/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -52,7 +52,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp003
 *        nsk.jdwp.EventRequest.ClearAllBreakpoints.clrallbreakp003a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -58,7 +58,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.EventRequest.Set.set001
 *        nsk.jdwp.EventRequest.Set.set001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/EventRequest/Set/set002/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.EventRequest.Set.set002
 *        nsk.jdwp.EventRequest.Set.set002a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/Bytecodes/bytecodes001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -53,7 +53,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Method.Bytecodes.bytecodes001
 *        nsk.jdwp.Method.Bytecodes.bytecodes001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -56,7 +56,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Method.IsObsolete.isobsolete001
 *        nsk.jdwp.Method.IsObsolete.isobsolete001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@ -70,13 +70,9 @@ public class isobsolete002 {
    static final int BREAKPOINT_LINE = isobsolete002a.BREAKPOINT_LINE;

    // filename for redefined class
-//   4691123 TEST: some jdi tests contain precompiled .klass files undes SCCS
-//   precomiled class was removed
-//    static final String REDEFINED_CLASS_FILE_NAME = "isobsolete002b.klass";
-    static final String REDEFINED_CLASS_FILE_NAME = "newclass"
-                    + File.separator + PACKAGE_NAME.replace('.',File.separatorChar)
+    static final String REDEFINED_CLASS_FILE_NAME = "bin" + File.separator + "newclass"
+                    + File.separator + PACKAGE_NAME.replace('.', File.separatorChar)
                    + File.separator + "isobsolete002b.class";
-//                    + File.separator + "isobsolete002b.klass";

    // usual scaffold objects
    ArgumentHandler argumentHandler = null;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -67,16 +67,12 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build ExecDriver
 * @build nsk.jdwp.Method.IsObsolete.isobsolete002
 *        nsk.jdwp.Method.IsObsolete.isobsolete002a
 *        nsk.jdwp.Method.IsObsolete.isobsolete002b
- * @run driver PropertyResolvingWrapper ExecDriver --cmd
- *      ${compile.jdk}/bin/javac
- *      -cp ${test.class.path}
- *      -d newclass
- *      newclass/isobsolete002b.java
+ * @run driver nsk.share.ExtraClassesBuilder
+ *      newclass
 * @run main/othervm PropertyResolvingWrapper
 *      nsk.jdwp.Method.IsObsolete.isobsolete002
 *      .
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/LineTable/linetable001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -67,7 +67,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Method.LineTable.linetable001
 *        nsk.jdwp.Method.LineTable.linetable001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTable/vartable001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -56,7 +56,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Method.VariableTable.vartable001
 *        nsk.jdwp.Method.VariableTable.vartable001a
 * @comment debuggee should be compiled w/ debug info
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Method/VariableTableWithGeneric/vartblwithgen001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -56,7 +56,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.Method.VariableTableWithGeneric.vartblwithgen001
 *        nsk.jdwp.Method.VariableTableWithGeneric.vartblwithgen001a
 * @comment debuggee should be compiled w/ debug info
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/DisableCollection/disablecol001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -53,7 +53,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.DisableCollection.disablecol001
 *        nsk.jdwp.ObjectReference.DisableCollection.disablecol001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/EnableCollection/enablecol001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -54,7 +54,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.EnableCollection.enablecol001
 *        nsk.jdwp.ObjectReference.EnableCollection.enablecol001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/GetValues/getvalues001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -57,7 +57,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.GetValues.getvalues001
 *        nsk.jdwp.ObjectReference.GetValues.getvalues001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/InvokeMethod/invokemeth001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.InvokeMethod.invokemeth001
 *        nsk.jdwp.ObjectReference.InvokeMethod.invokemeth001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/IsCollected/iscollected001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -56,7 +56,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.IsCollected.iscollected001
 *        nsk.jdwp.ObjectReference.IsCollected.iscollected001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/MonitorInfo/monitorinfo001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -68,7 +68,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.MonitorInfo.monitorinfo001
 *        nsk.jdwp.ObjectReference.MonitorInfo.monitorinfo001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferenceType/referencetype001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -58,7 +58,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.ReferenceType.referencetype001
 *        nsk.jdwp.ObjectReference.ReferenceType.referencetype001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects001/referringObjects001.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -69,7 +69,6 @@
 * @requires !vm.graal.enabled
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.ReferringObjects.referringObjects001.referringObjects001
 * @run main/othervm/native PropertyResolvingWrapper
 *      nsk.jdwp.ObjectReference.ReferringObjects.referringObjects001.referringObjects001
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/ReferringObjects/referringObjects002/referringObjects002.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -58,7 +58,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.ReferringObjects.referringObjects002.referringObjects002
 * @run main/othervm/native PropertyResolvingWrapper
 *      nsk.jdwp.ObjectReference.ReferringObjects.referringObjects002.referringObjects002
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ObjectReference/SetValues/setvalues001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -67,7 +67,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ObjectReference.SetValues.setvalues001
 *        nsk.jdwp.ObjectReference.SetValues.setvalues001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassLoader/classloader001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -53,7 +53,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.ClassLoader.classloader001
 *        nsk.jdwp.ReferenceType.ClassLoader.classloader001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/ClassObject/classobj001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -53,7 +53,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.ClassObject.classobj001
 *        nsk.jdwp.ReferenceType.ClassObject.classobj001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Fields/fields001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -55,7 +55,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Fields.fields001
 *        nsk.jdwp.ReferenceType.Fields.fields001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/FieldsWithGeneric/fldwithgeneric001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.FieldsWithGeneric.fldwithgeneric001
 *        nsk.jdwp.ReferenceType.FieldsWithGeneric.fldwithgeneric001t
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/GetValues/getvalues001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -56,7 +56,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.GetValues.getvalues001
 *        nsk.jdwp.ReferenceType.GetValues.getvalues001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances001/instances001.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -64,7 +64,6 @@
 * @requires !vm.graal.enabled
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Instances.instances001.instances001
 * @run main/othervm/native PropertyResolvingWrapper
 *      nsk.jdwp.ReferenceType.Instances.instances001.instances001
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Instances/instances002/instances002.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -57,7 +57,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Instances.instances002.instances002
 * @run main/othervm PropertyResolvingWrapper
 *      nsk.jdwp.ReferenceType.Instances.instances002.instances002
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Interfaces/interfaces001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -57,7 +57,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Interfaces.interfaces001
 *        nsk.jdwp.ReferenceType.Interfaces.interfaces001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Methods/methods001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -55,7 +55,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Methods.methods001
 *        nsk.jdwp.ReferenceType.Methods.methods001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/MethodsWithGeneric/methwithgeneric001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.MethodsWithGeneric.methwithgeneric001
 *        nsk.jdwp.ReferenceType.MethodsWithGeneric.methwithgeneric001t
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Modifiers/modifiers001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -55,7 +55,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Modifiers.modifiers001
 *        nsk.jdwp.ReferenceType.Modifiers.modifiers001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/NestedTypes/nestedtypes001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.NestedTypes.nestedtypes001
 *        nsk.jdwp.ReferenceType.NestedTypes.nestedtypes001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Signature/signature001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -51,7 +51,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Signature.signature001
 *        nsk.jdwp.ReferenceType.Signature.signature001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SignatureWithGeneric/sigwithgeneric001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -43,7 +43,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.SignatureWithGeneric.sigwithgeneric001
 *        nsk.jdwp.ReferenceType.SignatureWithGeneric.sigwithgeneric001t
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -38,7 +38,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.SourceDebugExtension.srcdebugext001
 *        nsk.jdwp.ReferenceType.SourceDebugExtension.srcdebugext001t
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/SourceFile/srcfile001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -51,7 +51,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.SourceFile.srcfile001
 *        nsk.jdwp.ReferenceType.SourceFile.srcfile001a
 * @run main/othervm PropertyResolvingWrapper
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ReferenceType/Status/status001/TestDescription.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -53,7 +53,6 @@
 *
 * @library /vmTestbase /test/hotspot/jtreg/vmTestbase
 *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
 * @build nsk.jdwp.ReferenceType.Status.status001
 *        nsk.jdwp.ReferenceType.Status.status001a
 * @run main/othervm PropertyResolvingWrapper
--- a/Show More
+++ b/Show More