# HG changeset patch
# User iignatyev
# Date 1594658024 25200
#      Mon Jul 13 09:33:44 2020 -0700
# Node ID 8882fedea705f712b77c19f47c813411977c2077
# Parent  cd766db99c407b3d9026685fba2cdc43bac3996d
[mq]: 8249032

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java
@@ -43,7 +43,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java
@@ -42,7 +42,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java
@@ -42,7 +42,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java
@@ -43,7 +43,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java
@@ -42,7 +42,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java
@@ -42,7 +42,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java
@@ -45,7 +45,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java
@@ -44,7 +44,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java
@@ -44,7 +44,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java
@@ -45,7 +45,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java
@@ -44,7 +44,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java
@@ -44,7 +44,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder btree
  * @comment build fats.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.BTreeTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain001/chain001.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain001/chain001.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain001/chain001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain001/chain001.java
@@ -41,7 +41,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain002/chain002.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain002/chain002.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain002/chain002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain002/chain002.java
@@ -41,7 +41,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain003/chain003.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain003/chain003.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain003/chain003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain003/chain003.java
@@ -41,7 +41,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain004/chain004.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain004/chain004.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain004/chain004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain004/chain004.java
@@ -41,7 +41,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain005/chain005.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain005/chain005.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain005/chain005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain005/chain005.java
@@ -43,7 +43,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain006/chain006.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain006/chain006.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain006/chain006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain006/chain006.java
@@ -43,7 +43,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java
@@ -43,7 +43,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain008/chain008.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain008/chain008.java
--- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain008/chain008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain008/chain008.java
@@ -43,7 +43,6 @@
  * @run driver nsk.sysdict.share.GenClassesBuilder fats
  * @comment build leans.jar
  * @run driver nsk.sysdict.share.GenClassesBuilder leans
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.sysdict.share.ChainTest
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit