changeset 60135:39b75aa17f21

Merge
author mikael
date Fri, 10 Jul 2020 23:12:29 -0700
parents 796c9fa50850 c2452eb20d8a
children 2630948916e8
files src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
diffstat 563 files changed, 574 insertions(+), 744 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java	Fri Jul 10 23:12:29 2020 -0700
@@ -87,8 +87,12 @@
                 ThreadGroup tg = Thread.currentThread().getThreadGroup();
                 while (tg.getParent() != null) tg = tg.getParent();
                 ThreadGroup systemThreadGroup = tg;
+
+                // For a debug build, the stack shadow zone is larger;
+                // Increase the total stack size to avoid potential stack overflow.
+                int debugDelta = "release".equals(System.getProperty("jdk.debug")) ? 0 : (4*4096);
                 final long stackSize = Boolean.getBoolean("jdk.lang.processReaperUseDefaultStackSize")
-                        ? 0 : REAPER_DEFAULT_STACKSIZE;
+                        ? 0 : REAPER_DEFAULT_STACKSIZE + debugDelta;
 
                 ThreadFactory threadFactory = grimReaper -> {
                     Thread t = new Thread(systemThreadGroup, grimReaper,
--- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java	Fri Jul 10 23:12:29 2020 -0700
@@ -472,7 +472,9 @@
                 outFile.toAbsolutePath().toString()));
 
         // run dpkg
-        Executor.of(cmdline.toArray(String[]::new)).executeExpectSuccess();
+        RetryExecutor.retryOnKnownErrorMessage(
+                "semop(1): encountered an error: Invalid argument").execute(
+                        cmdline.toArray(String[]::new));
 
         Log.verbose(MessageFormat.format(I18N.getString(
                 "message.output-to-location"), outFile.toAbsolutePath().toString()));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java	Fri Jul 10 23:12:29 2020 -0700
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package jdk.incubator.jpackage.internal;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+public final class RetryExecutor {
+    RetryExecutor() {
+        setMaxAttemptsCount(5);
+        setAttemptTimeoutMillis(2 * 1000);
+    }
+
+    RetryExecutor setMaxAttemptsCount(int v) {
+        attempts = v;
+        return this;
+    }
+
+    RetryExecutor setAttemptTimeoutMillis(int v) {
+        timeoutMillis = v;
+        return this;
+    }
+
+    RetryExecutor setExecutorInitializer(Consumer<Executor> v) {
+        executorInitializer = v;
+        return this;
+    }
+
+    void abort() {
+        aborted = true;
+    }
+
+    static RetryExecutor retryOnKnownErrorMessage(String v) {
+        RetryExecutor result = new RetryExecutor();
+        return result.setExecutorInitializer(exec -> {
+            exec.setOutputConsumer(output -> {
+                if (!output.anyMatch(v::equals)) {
+                    result.abort();
+                }
+            });
+        });
+    }
+
+    void execute(String cmdline[]) throws IOException {
+        aborted = false;
+        for (;;) {
+            try {
+                Executor exec = Executor.of(cmdline);
+                if (executorInitializer != null) {
+                    executorInitializer.accept(exec);
+                }
+                exec.executeExpectSuccess();
+                break;
+            } catch (IOException ex) {
+                if (aborted || (--attempts) <= 0) {
+                    throw ex;
+                }
+            }
+
+            try {
+                Thread.sleep(timeoutMillis);
+            } catch (InterruptedException ex) {
+                Log.verbose(ex);
+                throw new RuntimeException(ex);
+            }
+        }
+    }
+
+    private Consumer<Executor> executorInitializer;
+    private boolean aborted;
+    private int attempts;
+    private int timeoutMillis;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VolatileAccessReadEliminationTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, Red Hat Inc. 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.
+ */
+
+
+package org.graalvm.compiler.core.test;
+
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import org.graalvm.compiler.core.common.type.IntegerStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.junit.Assert;
+import org.junit.Test;
+
+// See https://bugs.openjdk.java.net/browse/JDK-8248598
+public class VolatileAccessReadEliminationTest extends GraalCompilerTest {
+    private static int field;
+    private Thread thread;
+    private static long[] array = new long[1];
+
+    static {
+        arrayBaseOffset = UNSAFE.arrayBaseOffset(long[].class);
+    }
+
+    private static int arrayBaseOffset;
+
+    public static int testMethod1() {
+        int v = field;
+        UNSAFE.putLongVolatile(array, arrayBaseOffset, 1);
+        while (UNSAFE.getLongVolatile(array, arrayBaseOffset) != 2) {
+            // wait for other thread
+        }
+        return v + field; // field load shouldn't common with one above.
+    }
+
+    @Test
+    public void test1() {
+        test("testMethod1");
+    }
+
+    @Override
+    protected void before(ResolvedJavaMethod method) {
+        field = 0;
+        UNSAFE.putLongVolatile(array, arrayBaseOffset, 0);
+        thread = new Thread() {
+            @Override
+            public void run() {
+                while (UNSAFE.getLongVolatile(array, arrayBaseOffset) != 1) {
+                    // wait for test thread to start
+                }
+                field = 0x42;
+                UNSAFE.putLongVolatile(array, arrayBaseOffset, 2);
+            }
+        };
+        thread.start();
+    }
+
+    @Override
+    protected void after() {
+        try {
+            thread.join();
+        } catch (InterruptedException e) {
+        }
+    }
+
+    public static int testMethod2(int offset) {
+        int v = field;
+        long v2 = UNSAFE.getLongVolatile(array, offset);
+        return v + field + (int) v2; // field load shouldn't common with one above.
+    }
+
+    @Test
+    public void test2() {
+        final StructuredGraph graph = getFinalGraph("testMethod2");
+        Assert.assertEquals(2, getFieldReads(graph));
+    }
+
+    public static int testMethod3(int offset) {
+        int v = field;
+        UNSAFE.putLongVolatile(array, offset, 0x42);
+        return v + field; // field load shouldn't common with one above.
+    }
+
+    @Test
+    public void test3() {
+        final StructuredGraph graph = getFinalGraph("testMethod3");
+        Assert.assertEquals(2, getFieldReads(graph));
+    }
+
+    private static int getFieldReads(StructuredGraph graph) {
+        return graph.getNodes().filter(n -> n instanceof ReadNode).filter(n -> {
+            final Stamp stamp = ((ReadNode) n).stamp(NodeView.DEFAULT);
+            return stamp instanceof IntegerStamp && ((IntegerStamp) stamp).getBits() == 32;
+        }).count();
+    }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java	Fri Jul 10 23:12:29 2020 -0700
@@ -179,6 +179,10 @@
     }
 
     private boolean processUnsafeLoad(RawLoadNode load, PEReadEliminationBlockState state, GraphEffectList effects) {
+        if (load.isVolatile()) {
+            state.killReadCache();
+            return false;
+        }
         if (load.offset().isConstant()) {
             ResolvedJavaType type = StampTool.typeOrNull(load.object());
             if (type != null && type.isArray()) {
@@ -205,6 +209,10 @@
     }
 
     private boolean processUnsafeStore(RawStoreNode store, PEReadEliminationBlockState state, GraphEffectList effects) {
+        if (store.isVolatile()) {
+            state.killReadCache();
+            return false;
+        }
         ResolvedJavaType type = StampTool.typeOrNull(store.object());
         if (type != null && type.isArray()) {
             JavaKind accessKind = store.accessKind();
--- a/test/hotspot/jtreg/ProblemList-graal.txt	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/ProblemList-graal.txt	Fri Jul 10 23:12:29 2020 -0700
@@ -229,6 +229,7 @@
 compiler/loopopts/TestOverunrolling.java                8207267   generic-all
 compiler/jsr292/NonInlinedCall/InvokeTest.java          8207267   generic-all
 compiler/codegen/TestTrichotomyExpressions.java         8207267   generic-all
+gc/stress/TestReclaimStringsLeaksMemory.java            8207267   generic-all
 
 runtime/exceptionMsgs/AbstractMethodError/AbstractMethodErrorTest.java        8222582 generic-all
 
--- a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -27,7 +27,7 @@
  * @bug 8059022
  * @modules java.base/jdk.internal.misc:+open
  * @summary Validate barriers after Unsafe getReference, CAS and swap (GetAndSet)
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @library /test/lib
  * @run main/othervm -XX:+UseZGC -XX:+UnlockDiagnosticVMOptions -XX:+ZVerifyViews -XX:ZCollectionInterval=1 -XX:-CreateCoredumpOnCrash -XX:CompileCommand=dontinline,*::mergeImpl* compiler.gcbarriers.UnsafeIntrinsicsTest
  */
--- a/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java	Fri Jul 10 23:12:29 2020 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @bug 8237859
  * @summary A LoadP node has a wrong control input (too early) which results in an out-of-bounds read of an object array with ZGC.
  *
--- a/test/hotspot/jtreg/gc/CriticalNativeArgs.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/CriticalNativeArgs.java	Fri Jul 10 23:12:29 2020 -0700
@@ -28,7 +28,8 @@
  * @test CriticalNativeStressEpsilon
  * @bug 8199868
  * @library /
- * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Epsilon & !vm.graal.enabled
+ * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386"
+ * @requires vm.gc.Epsilon
  * @summary test argument unpacking nmethod wrapper of critical native method
  * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xcomp -Xmx256M -XX:+CriticalJNINatives gc.CriticalNativeArgs
  */
@@ -37,7 +38,8 @@
  * @test CriticalNativeStressShenandoah
  * @bug 8199868
  * @library /
- * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386"
+ * @requires vm.gc.Shenandoah
  * @summary test argument unpacking nmethod wrapper of critical native method
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive    -XX:+ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.CriticalNativeArgs
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive    -XX:-ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.CriticalNativeArgs
--- a/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 /*
  * @test TestHumongousReferenceObjectShenandoah
  * @summary Test that verifies that iteration over large, plain Java objects, that potentially cross region boundaries, with references in them works.
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @bug 8151499 8153734
  * @modules java.base/jdk.internal.vm.annotation
  * @run main/othervm -XX:+EnableContended -XX:-RestrictContended -Xms128m -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahRegionSize=8M -XX:ContendedPaddingWidth=8192 gc.TestHumongousReferenceObject
--- a/test/hotspot/jtreg/gc/TestSystemGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/TestSystemGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -49,7 +49,7 @@
 
 /*
  * @test TestSystemGCShenandoah
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Runs System.gc() with different flags.
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.TestSystemGC
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ExplicitGCInvokesConcurrent gc.TestSystemGC
--- a/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java	Fri Jul 10 23:12:29 2020 -0700
@@ -51,8 +51,7 @@
 /**
  * @test TestAlignmentToUseLargePagesShenandoah
  * @bug 8024396
- * @comment Graal does not support Shenandoah
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @run main/othervm -Xms71M -Xmx91M -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-UseLargePages gc.arguments.TestAlignmentToUseLargePages
  */
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java	Fri Jul 10 23:12:29 2020 -0700
@@ -68,8 +68,7 @@
 /*
  * @test TestUseCompressedOopsErgoShenandoah
  * @bug 8010722
- * @comment Graal does not support Shenandoah
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @library /
  * @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java	Fri Jul 10 23:12:29 2020 -0700
@@ -77,8 +77,7 @@
 /*
  * @test TestClassUnloadingDisabledShenandoah
  * @bug 8114823
- * @comment Graal does not support Shenandoah
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.ClassUnloading != true
  * @library /test/lib
--- a/test/hotspot/jtreg/gc/epsilon/TestAlignment.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestAlignment.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestAlignment
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Check Epsilon runs fine with (un)usual alignments
  * @bug 8212005
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -Xmx128m -XX:+UseEpsilonGC -XX:+UseTLAB gc.epsilon.TestAlignment
--- a/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java	Fri Jul 10 23:12:29 2020 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test TestAlwaysPretouch
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Basic sanity test for Epsilon
  * @run main/othervm -Xms128m -Xmx1g                     -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch
  * @run main/othervm -Xms128m -Xmx1g -XX:-AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch
--- a/test/hotspot/jtreg/gc/epsilon/TestArraycopyCheckcast.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestArraycopyCheckcast.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestArraycopyCheckcast
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon is able to handle checkcasted array copies
  * @library /test/lib
  * @bug 8215724
--- a/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 /**
  * @test TestByteArrays
  * @key randomness
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon is able to allocate arrays, and does not corrupt their state
  * @library /test/lib
  *
--- a/test/hotspot/jtreg/gc/epsilon/TestClasses.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestClasses.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestClasses
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon is able to allocate a lot of classes
  *
  * @modules java.base/jdk.internal.org.objectweb.asm
--- a/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestDieDefault
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon GC should die on heap exhaustion
  * @library /test/lib
  * @run driver gc.epsilon.TestDieDefault
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestDieWithHeapDump
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon GC should die on heap exhaustion with error handler attached
  * @library /test/lib
  * @run driver gc.epsilon.TestDieWithHeapDump
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestDieWithOnError
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon GC should die on heap exhaustion with error handler attached
  * @library /test/lib
  * @run driver gc.epsilon.TestDieWithOnError
--- a/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 /**
  * @test TestElasticTLAB
  * @key randomness
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon is able to work with/without elastic TLABs
  * @library /test/lib
  *
--- a/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 /**
  * @test TestElasticTLABDecay
  * @key randomness
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon is able to work with/without elastic TLABs
  * @library /test/lib
  *
--- a/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestAlwaysPretouch
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Basic sanity test for Epsilon
  * @library /test/lib
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestEpsilonEnabled
--- a/test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestHelloWorld
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Basic sanity test for Epsilon
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestHelloWorld
  */
--- a/test/hotspot/jtreg/gc/epsilon/TestLogTrace.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestLogTrace.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 
 /**
  * @test TestLogTrace
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Test that tracing does not crash Epsilon
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc*=trace gc.epsilon.TestLogTrace
  */
--- a/test/hotspot/jtreg/gc/epsilon/TestManyThreads.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestManyThreads.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestManyThreads
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Test allocations from many threads
  *
  * @run main/othervm -Xmx128m -Xss512k                                        -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestManyThreads
--- a/test/hotspot/jtreg/gc/epsilon/TestMaxTLAB.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestMaxTLAB.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestMaxTLAB
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Check EpsilonMaxTLAB options
  * @bug 8212177
  *
--- a/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 
 /**
  * @test TestMemoryMXBeans
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Test JMX memory beans
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 
 /**
  * @test TestMemoryPools
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Test JMX memory pools
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/epsilon/TestObjects.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestObjects.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 /**
  * @test TestObjects
  * @key randomness
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon is able to allocate objects, and does not corrupt their state
  * @library /test/lib
  *
--- a/test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestPrintSteps
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Tests -XX:EpsilonPrintHeapSteps works
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=0    gc.epsilon.TestPrintHeapSteps
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=1    gc.epsilon.TestPrintHeapSteps
--- a/test/hotspot/jtreg/gc/epsilon/TestRefArrays.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestRefArrays.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
 /**
  * @test TestRefArrays
  * @key randomness
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Epsilon is able to allocate arrays, and does not corrupt their state
  * @library /test/lib
  *
--- a/test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test TestUpdateCountersSteps
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Test EpsilonUpdateCountersStep works
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=1    gc.epsilon.TestUpdateCountersSteps
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=10   gc.epsilon.TestUpdateCountersSteps
--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,7 +81,7 @@
 
 /* @test TestMetaspacePerfCountersShenandoah
  * @bug 8014659
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib /
  * @summary Tests that performance counters for metaspace and compressed class
  *          space exists and works.
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestAllocHumongousFragment
  * @summary Make sure Shenandoah can recover from humongous allocation fragmentation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -Xms1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahTargetNumRegions=2048
@@ -54,7 +54,7 @@
  * @test TestAllocHumongousFragment
  * @summary Make sure Shenandoah can recover from humongous allocation fragmentation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -Xms1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahTargetNumRegions=2048
@@ -123,7 +123,7 @@
  * @test TestAllocHumongousFragment
  * @summary Make sure Shenandoah can recover from humongous allocation fragmentation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestAllocIntArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -54,7 +54,7 @@
  * @test TestAllocIntArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -140,7 +140,7 @@
  * @test TestAllocIntArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestAllocObjectArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -54,7 +54,7 @@
  * @test TestAllocObjectArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -140,7 +140,7 @@
  * @test TestAllocObjectArrays
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestAllocObjects
  * @summary Acceptance tests: collector can withstand allocation
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -51,7 +51,7 @@
 /*
  * @test TestAllocObjects
  * @summary Acceptance tests: collector can withstand allocation
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -137,7 +137,7 @@
 /*
  * @test TestAllocObjects
  * @summary Acceptance tests: collector can withstand allocation
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestArrayCopyCheckCast
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyCheckCast
  */
--- a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyStress.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyStress.java	Fri Jul 10 23:12:29 2020 -0700
@@ -28,7 +28,7 @@
 /*
  * @test TestArrayCopyStress
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyStress
--- a/test/hotspot/jtreg/gc/shenandoah/TestElasticTLAB.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestElasticTLAB.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestElasticTLAB
  * @key randomness
  * @summary Test that Shenandoah is able to work with elastic TLABs
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -XX:-UseTLAB -XX:-ShenandoahElasticTLAB -XX:+ShenandoahVerify TestElasticTLAB
--- a/test/hotspot/jtreg/gc/shenandoah/TestEvilSyncBug.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestEvilSyncBug.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestEvilSyncBug
  * @summary Tests for crash/assert when attaching init thread during shutdown
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestGCThreadGroups
  * @summary Test Shenandoah GC uses concurrent/parallel threads correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -37,7 +37,7 @@
 /**
  * @test TestGCThreadGroups
  * @summary Test Shenandoah GC uses concurrent/parallel threads correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC
@@ -79,7 +79,7 @@
 /**
  * @test TestGCThreadGroups
  * @summary Test Shenandoah GC uses concurrent/parallel threads correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
--- a/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestHeapUncommit
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
@@ -54,7 +54,7 @@
  * @test TestHeapUncommit
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
@@ -88,7 +88,7 @@
  * @test TestHeapUncommit
  * @summary Acceptance tests: collector can withstand allocation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
@@ -108,7 +108,8 @@
 /*
  * @test TestHeapUncommit
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:+UseLargePages
--- a/test/hotspot/jtreg/gc/shenandoah/TestHumongousThreshold.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestHumongousThreshold.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestHumongousThreshold
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g
@@ -71,7 +71,8 @@
 /*
  * @test TestHumongousThreshold
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g
--- a/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,8 @@
  * @test TestLargeObjectAlignment
  * @summary Shenandoah crashes with -XX:ObjectAlignmentInBytes=16
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xint                   TestLargeObjectAlignment
--- a/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestLotsOfCycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -41,7 +41,7 @@
 
 /*
  * @test TestLotsOfCycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -93,7 +93,7 @@
 
 /*
  * @test TestLotsOfCycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestObjIterWithHeapDump
  * @summary Test heap dump triggered heap object iteration
  * @bug 8225014
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestObjItrWithHeapDump
  */
--- a/test/hotspot/jtreg/gc/shenandoah/TestParallelRefprocSanity.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestParallelRefprocSanity.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestParallelRefprocSanity
  * @summary Test that reference processing works with both parallel and non-parallel variants.
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g                              TestParallelRefprocSanity
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g  -XX:-ParallelRefProcEnabled TestParallelRefprocSanity
--- a/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestPeriodicGC
  * @summary Test that periodic GC is working
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestPeriodicGC
  */
--- a/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestRefprocSanity
  * @summary Test that null references/referents work fine
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC
@@ -44,7 +44,7 @@
 /*
  * @test TestRefprocSanity
  * @summary Test that null references/referents work fine
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
--- a/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestRegionSampling
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -39,7 +39,7 @@
 
 /*
  * @test TestRegionSampling
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive
@@ -75,7 +75,7 @@
 
 /*
  * @test TestRegionSampling
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestRetainObjects
  * @summary Acceptance tests: collector can deal with retained objects
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -51,7 +51,7 @@
 /*
  * @test TestRetainObjects
  * @summary Acceptance tests: collector can deal with retained objects
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -117,7 +117,7 @@
 /*
  * @test TestRetainObjects
  * @summary Acceptance tests: collector can deal with retained objects
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestSieveObjects
  * @summary Acceptance tests: collector can deal with retained objects
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -54,7 +54,7 @@
  * @test TestSieveObjects
  * @summary Acceptance tests: collector can deal with retained objects
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -131,7 +131,7 @@
  * @test TestSieveObjects
  * @summary Acceptance tests: collector can deal with retained objects
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
--- a/test/hotspot/jtreg/gc/shenandoah/TestSmallHeap.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestSmallHeap.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestSmallHeap
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC         TestSmallHeap
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx64m TestSmallHeap
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestStringDedup
  * @summary Test Shenandoah string deduplication implementation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
@@ -47,7 +47,7 @@
  * @test TestStringDedup
  * @summary Test Shenandoah string deduplication implementation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
@@ -70,7 +70,7 @@
  * @test TestStringDedup
  * @summary Test Shenandoah string deduplication implementation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestStringDedupStress
  * @summary Test Shenandoah string deduplication implementation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
@@ -47,7 +47,7 @@
  * @test TestStringDedupStress
  * @summary Test Shenandoah string deduplication implementation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
@@ -78,7 +78,7 @@
  * @test TestStringDedupStress
  * @summary Test Shenandoah string deduplication implementation
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestStringInternCleanup
  * @summary Check that Shenandoah cleans up interned strings
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -51,7 +51,7 @@
 /*
  * @test TestStringInternCleanup
  * @summary Check that Shenandoah cleans up interned strings
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -78,7 +78,7 @@
 /*
  * @test TestStringInternCleanup
  * @summary Check that Shenandoah cleans up interned strings
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
--- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestVerifyJCStress
  * @summary Tests that we pass at least one jcstress-like test with all verification turned on
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
@@ -43,7 +43,7 @@
 /*
  * @test TestVerifyJCStress
  * @summary Tests that we pass at least one jcstress-like test with all verification turned on
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
@@ -61,7 +61,7 @@
 /*
  * @test TestVerifyJCStress
  * @summary Tests that we pass at least one jcstress-like test with all verification turned on
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
--- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyLevels.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyLevels.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestVerifyLevels
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UnlockDiagnosticVMOptions -Xmx128m -XX:+ShenandoahVerify -XX:ShenandoahVerifyLevel=0 TestVerifyLevels
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UnlockDiagnosticVMOptions -Xmx128m -XX:+ShenandoahVerify -XX:ShenandoahVerifyLevel=1 TestVerifyLevels
--- a/test/hotspot/jtreg/gc/shenandoah/TestWithLogLevel.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestWithLogLevel.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
  /*
  * @test TestWithLogLevel
  * @summary Test Shenandoah with different log levels
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xms256M -Xmx1G -Xlog:gc*=error   TestWithLogLevel
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xms256M -Xmx1G -Xlog:gc*=warning TestWithLogLevel
--- a/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestWrongArrayMember
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC                         TestWrongArrayMember
  * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu TestWrongArrayMember
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @bug 8237837 8244721
  * @summary  Shenandoah: assert(mem == __null) failed: only one safepoint
  * @requires vm.flavor == "server"
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xcomp -XX:CompileOnly=BarrierInInfiniteLoop::test1
  *                   -XX:CompileOnly=BarrierInInfiniteLoop::test2 -XX:CompileOnly=BarrierInInfiniteLoop::test3 -XX:CompileCommand=quiet BarrierInInfiniteLoop
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8231405
  * @summary barrier expansion breaks if barrier is right after call to rethrow stub
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:CompileOnly=CallMultipleCatchProjs::test -Xcomp -Xverify:none -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC CallMultipleCatchProjs
  *
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/FoldIfAfterExpansion.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/FoldIfAfterExpansion.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 /**
  * @test 8238385
  * @summary CTW: C2 (Shenandoah) compilation fails with "Range check dependent CastII node was not removed"
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/LRBRightAfterMemBar.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/LRBRightAfterMemBar.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @bug 8237007
  * @summary Shenandoah: assert(_base == Tuple) failure during C2 compilation
  * @requires vm.flavor == "server"
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-BackgroundCompilation -XX:+UseShenandoahGC LRBRightAfterMemBar
  *
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1ArrayCopyNPE.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1ArrayCopyNPE.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /* @test TestC1ArrayCopyNPE
  * @summary test C1 arraycopy intrinsic
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestC1ArrayCopyNPE
  */
 
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1VectorizedMismatch.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1VectorizedMismatch.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /* @test TestC1VectorizedMismatch
  * @summary test C1 vectorized mismatch intrinsic
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestC1VectorizedMismatch
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 /*
  * @test TestClone
  * @summary Test clone barriers work correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
  *                   -XX:+UseShenandoahGC
@@ -50,7 +50,7 @@
 /*
  * @test TestClone
  * @summary Test clone barriers work correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
  *                   -XX:+UseShenandoahGC
@@ -81,7 +81,7 @@
 /*
  * @test TestClone
  * @summary Test clone barriers work correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
  *                   -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -107,7 +107,8 @@
 /*
  * @test TestClone
  * @summary Test clone barriers work correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
  *                   -XX:-UseCompressedOops
@@ -138,7 +139,8 @@
 /*
  * @test TestClone
  * @summary Test clone barriers work correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
  *                   -XX:-UseCompressedOops
@@ -174,7 +176,8 @@
 /*
  * @test TestClone
  * @summary Test clone barriers work correctly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
  *                   -XX:-UseCompressedOops
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestExpandedWBLostNullCheckDep.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestExpandedWBLostNullCheckDep.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 /**
  * @test TestExpandedWBLostNullCheckDep
  * @summary Logic that moves a null check in the expanded barrier may cause a memory access that doesn't depend on the barrier to bypass the null check
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @requires vm.flavor == "server"
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 /**
  * @test TestMaybeNullUnsafeAccess
  * @summary cast before unsafe access moved in dominating null check null path causes crash
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestNullCheck.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestNullCheck.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,8 @@
 /**
  * @test TestNullCheck
  * @summary implicit null check on brooks pointer must not cause crash
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
  *                   -Xmx4G -XX:HeapBaseMinAddress=0x800000000 TestNullCheck
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestReferenceCAS.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestReferenceCAS.java	Fri Jul 10 23:12:29 2020 -0700
@@ -29,7 +29,7 @@
 /*
  * @test TestReferenceCAS
  * @summary Shenandoah reference CAS test
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -Diters=20000 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahGCHeuristics=aggressive -XX:+UseShenandoahGC                                                 TestReferenceCAS
@@ -42,7 +42,8 @@
 /*
  * @test TestReferenceCAS
  * @summary Shenandoah reference CAS test
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -Diters=20000 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahGCHeuristics=aggressive -XX:+UseShenandoahGC -XX:-UseCompressedOops                          TestReferenceCAS
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahCmpPAfterCall.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahCmpPAfterCall.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @bug 8244663
  * @summary Shenandoah: C2 assertion fails in Matcher::collect_null_checks
  * @requires vm.flavor == "server"
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
  *                   -XX:CompileCommand=dontinline,TestShenandoahCmpPAfterCall::not_inlined TestShenandoahCmpPAfterCall
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahLRBInOuterStripMinedLoop.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahLRBInOuterStripMinedLoop.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @bug 8247824
  * @summary CTW: C2 (Shenandoah) compilation fails with SEGV in SBC2Support::pin_and_expand
  * @requires vm.flavor == "server"
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:-BackgroundCompilation -XX:+UseShenandoahGC -XX:LoopMaxUnroll=0 TestShenandoahLRBInOuterStripMinedLoop
  *
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeOffheapSwap.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeOffheapSwap.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 /**
  * @test TestUnsafeOffheapSwap
  * @summary Miscompilation in Unsafe off-heap swap routines
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc:+open
  *
  * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 /**
  * @test TestWriteBarrierClearControl
  * @summary Clearing control during final graph reshape causes memory barrier to loose dependency on null check
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @requires vm.flavor == "server"
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /* @test TestJNICritical
  * @summary test JNI critical arrays support in Shenandoah
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahVerify                 TestJNICritical
--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestJNIGlobalRefs.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestJNIGlobalRefs.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /* @test TestJNIGlobalRefs
  * @summary Test JNI Global Refs with Shenandoah
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm/native -Xmx1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -34,7 +34,7 @@
 
 /* @test TestJNIGlobalRefs
  * @summary Test JNI Global Refs with Shenandoah
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm/native -Xmx1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestPinnedGarbage.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestPinnedGarbage.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /* @test TestPinnedGarbage
  * @summary Test that garbage in the pinned region does not crash VM
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx512m
@@ -42,7 +42,7 @@
 /* @test TestPinnedGarbage
  * @summary Test that garbage in the pinned region does not crash VM
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx512m
--- a/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestHeapDump
  * @summary Tests JVMTI heap dumps
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @compile TestHeapDump.java
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive                        TestHeapDump
  *
@@ -34,7 +34,8 @@
 /**
  * @test TestHeapDump
  * @summary Tests JVMTI heap dumps
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  * @compile TestHeapDump.java
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive -XX:-UseCompressedOops TestHeapDump
  */
@@ -42,7 +43,7 @@
 /**
  * @test TestHeapDump
  * @summary Tests JVMTI heap dumps
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @compile TestHeapDump.java
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive                         -XX:+UseStringDeduplication TestHeapDump
  */
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestChurnNotifications
  * @summary Check that MX notifications are reported for all cycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -41,7 +41,7 @@
 /*
  * @test TestChurnNotifications
  * @summary Check that MX notifications are reported for all cycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -85,7 +85,7 @@
 /*
  * @test TestChurnNotifications
  * @summary Check that MX notifications are reported for all cycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryMXBeans.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryMXBeans.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestMemoryMXBeans
  * @summary Test JMX memory beans
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC          -Xmx1g TestMemoryMXBeans   -1 1024
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryPools.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryPools.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestMemoryPools
  * @summary Test JMX memory pools
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g TestMemoryPools
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestPauseNotifications
  * @summary Check that MX notifications are reported for all cycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive
@@ -41,7 +41,7 @@
 /*
  * @test TestPauseNotifications
  * @summary Check that MX notifications are reported for all cycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -81,7 +81,7 @@
 /*
  * @test TestPauseNotifications
  * @summary Check that MX notifications are reported for all cycles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestAllocLargeObj
  * @summary Test allocation of small object to result OOM, but not to crash JVM
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestAllocLargeObj
  */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestAllocLargerThanHeap
  * @summary Test that allocation of the object larger than heap fails predictably
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestAllocLargerThanHeap
  */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestAllocSmallObj
  * @summary Test allocation of small object to result OOM, but not to crash JVM
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestAllocSmallObj
  */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestClassLoaderLeak
  * @summary Test OOME in due to classloader leak
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestClassLoaderLeak
  */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestThreadFailure
  * @summary Test OOME in separate thread is recoverable
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestThreadFailure
  */
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestAlwaysPreTouch.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestAlwaysPreTouch.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestAlwaysPreTouch
  * @summary Check that Shenandoah's AlwaysPreTouch does not fire asserts
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+AlwaysPreTouch                                  -Xmx1g TestAlwaysPreTouch
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+AlwaysPreTouch -XX:ConcGCThreads=2              -Xmx1g TestAlwaysPreTouch
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestArgumentRanges
  * @summary Test that Shenandoah arguments are checked for ranges where applicable
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestClassUnloadingArguments
  * @summary Test that loop mining arguments are sane
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestClassUnloadingArguments
  */
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java	Fri Jul 10 23:12:29 2020 -0700
@@ -23,7 +23,7 @@
  */
 
 /* @test TestCodeCacheRootStyles
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=0 TestCodeCacheRootStyles
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestCriticalControlThreadPriority
  * @summary Check that ShenandoahCriticalControlThreadPriority works
  * @bug 8217343
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestEnabled.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestEnabled.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,14 +26,14 @@
 
 /*
  * @test TestEnabled
- * @requires vm.gc.Shenandoah & vm.gc == "null" & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah & vm.gc == "null"
  * @run main/othervm -Dexpected=false -Xmx64m                                                       TestEnabled
  * @run main/othervm -Dexpected=true  -Xmx64m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC TestEnabled
  */
 
 /*
  * @test TestEnabledAlready
- * @requires vm.gc.Shenandoah & vm.gc == "Shenandoah" & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah & vm.gc == "Shenandoah"
  * @run main/othervm -Dexpected=true -Xmx64m                                                        TestEnabled
  */
 public class TestEnabled {
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestExplicitGC
  * @summary Test that Shenandoah reacts to explicit GC flags appropriately
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestExplicitGCNoConcurrent
  * @summary Test that Shenandoah reacts to explicit GC flags appropriately
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestHeuristicsUnlock
  * @summary Test that Shenandoah heuristics are unlocked properly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousMoves.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousMoves.java	Fri Jul 10 23:12:29 2020 -0700
@@ -26,7 +26,7 @@
  * @test TestHumongousMoves
  * @summary Check Shenandoah reacts on setting humongous moves correctly
  * @key randomness
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  *
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestHumongousThresholdArgs
  * @summary Test that Shenandoah humongous threshold args are checked
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestLoopMiningArguments
  * @summary Test that loop mining arguments are sane
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @requires vm.flavor == "server"
  * @library /test/lib
  * @run driver TestLoopMiningArguments
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestModeUnlock
  * @summary Test that Shenandoah modes are unlocked properly
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestObjectAlignment
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC          TestObjectAlignment
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx16m  TestObjectAlignment
@@ -38,7 +38,8 @@
 
 /*
  * @test TestObjectAlignment
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16          TestObjectAlignment
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xmx16m  TestObjectAlignment
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestPacing.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestPacing.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestPacing
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-ShenandoahPacing -Xmx128m TestPacing
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahPacing -Xmx128m TestPacing
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestParallelRegionStride.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestParallelRegionStride.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestParallelRegionStride
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelRegionStride=1    -Xmx128m TestParallelRegionStride
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelRegionStride=10   -Xmx128m TestParallelRegionStride
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestRegionSizeArgs
  * @summary Test that Shenandoah region size args are checked
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /* @test TestSelectiveBarrierFlags
  * @summary Test selective barrier enabling works, by aggressively compiling HelloWorld with combinations
  *          of barrier flags
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestSelectiveBarrierFlags -Xint
  * @run driver TestSelectiveBarrierFlags -Xbatch -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSingleThreaded.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSingleThreaded.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /* @test TestSingleThreaded
  * @summary test single worker threaded Shenandoah
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
  *                   -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
  *                   -XX:ParallelGCThreads=1 -XX:ConcGCThreads=1 TestSingleThreaded
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestThreadCounts
  * @summary Test that Shenandoah GC thread counts are handled well
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 /*
  * @test TestThreadCountsOverride
  * @summary Test that Shenandoah GC thread counts are overridable
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /* @test TestWrongBarrierDisable
  * @summary Test that disabling wrong barriers fails early
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestWrongBarrierDisable
  */
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java	Fri Jul 10 23:12:29 2020 -0700
@@ -24,7 +24,7 @@
 
 /* @test TestWrongBarrierEnable
  * @summary Test that disabling wrong barriers fails early
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestWrongBarrierEnable
  */
--- a/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /*
 * @test TestShenandoah
-* @requires vm.gc.Shenandoah & !vm.graal.enabled
+* @requires vm.gc.Shenandoah
 * @bug 8006398
 * @summary Test that the Shenandoah collector does not print a warning message
 * @library /test/lib
--- a/test/hotspot/jtreg/gc/stress/CriticalNativeStress.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/CriticalNativeStress.java	Fri Jul 10 23:12:29 2020 -0700
@@ -33,7 +33,8 @@
  * @key randomness
  * @bug 8199868
  * @library / /test/lib
- * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Epsilon & !vm.graal.enabled
+ * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386"
+ * @requires vm.gc.Epsilon
  * @summary test argument pinning by nmethod wrapper of critical native method
  * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xcomp -Xmx1G -XX:+CriticalJNINatives gc.stress.CriticalNativeStress
  */
@@ -43,7 +44,8 @@
  * @key randomness
  * @bug 8199868
  * @library / /test/lib
- * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386"
+ * @requires vm.gc.Shenandoah
  * @summary test argument pinning by nmethod wrapper of critical native method
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive    -XX:-ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.stress.CriticalNativeStress
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive    -XX:+ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.stress.CriticalNativeStress
--- a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java	Fri Jul 10 23:12:29 2020 -0700
@@ -27,7 +27,8 @@
  * @test TestReclaimStringsLeaksMemory
  * @bug 8180048
  * @summary Ensure that during a Full GC interned string memory is reclaimed completely.
- * @requires vm.gc=="null" & !vm.graal.enabled & !vm.debug
+ * @requires vm.gc == "null"
+ * @requires !vm.debug
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @run driver gc.stress.TestReclaimStringsLeaksMemory
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,8 +30,8 @@
  * @test TestGCBasherWithShenandoah
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -49,8 +49,8 @@
  * @test TestGCBasherWithShenandoah
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -72,8 +72,8 @@
  * @test TestGCBasherWithShenandoah
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -103,8 +103,8 @@
  * @test TestGCBasherWithShenandoah
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -126,8 +126,8 @@
  * @test TestGCBasherWithShenandoah
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -145,7 +145,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -166,7 +166,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -192,7 +192,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -226,7 +226,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -252,7 +252,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
  *
  * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,7 @@
  * @key stress
  * @library /
  * @requires vm.gc.Z
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress ZGC
  * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx384m -server -XX:+UseZGC gc.stress.gcbasher.TestGCBasherWithZ 120000
  */
@@ -41,10 +41,10 @@
  * @key stress
  * @library /
  * @requires vm.gc.Z
- * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress ZGC with nmethod barrier forced deoptimization enabled.
  * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx384m -server -XX:+UseZGC
- *  -XX:+UnlockDiagnosticVMOptions -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
+ *   -XX:+UnlockDiagnosticVMOptions -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
  *   gc.stress.gcbasher.TestGCBasherWithZ 120000
  */
 public class TestGCBasherWithZ {
--- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java	Fri Jul 10 23:12:29 2020 -0700
@@ -27,7 +27,7 @@
 /*
  * @test TestGCLockerWithShenandoah
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress Shenandoah's JNI handling by calling GetPrimitiveArrayCritical while concurrently filling up old gen.
  *
  * @run main/native/othervm/timeout=200 -Xlog:gc*=info -Xms1500m -Xmx1500m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java	Fri Jul 10 23:12:29 2020 -0700
@@ -27,7 +27,7 @@
  * @test TestGCOldWithShenandoah
  * @key stress randomness
  * @library / /test/lib
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm/timeout=600 -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -55,7 +55,7 @@
  * @test TestGCOldWithShenandoah
  * @key stress randomness
  * @library / /test/lib
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -106,7 +106,7 @@
  * @test TestGCOldWithShenandoah
  * @key stress randomness
  * @library / /test/lib
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
  *
  * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java	Fri Jul 10 23:12:29 2020 -0700
@@ -28,7 +28,7 @@
  * @test TestGCOldWithZ
  * @key randomness
  * @library / /test/lib
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Stress the Z
  * @run main/othervm -Xmx384M -XX:+UseZGC gc.stress.gcold.TestGCOldWithZ 50 1 20 10 10000
  * @run main/othervm -Xmx256m -XX:+UseZGC gc.stress.gcold.TestGCOldWithZ 50 5 20 1 5000
--- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java	Fri Jul 10 23:12:29 2020 -0700
@@ -28,7 +28,7 @@
  * @test TestSystemGCWithShenandoah
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  *
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
@@ -45,7 +45,7 @@
  * @test TestSystemGCWithShenandoah
  * @key stress
  * @library /
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc().
  *
  * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/gc/z/TestAllocateHeapAt.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestAllocateHeapAt.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /*
  * @test TestAllocateHeapAt
- * @requires vm.gc.Z & os.family == "linux" & !vm.graal.enabled
+ * @requires vm.gc.Z & os.family == "linux"
  * @summary Test ZGC with -XX:AllocateHeapAt
  * @library /test/lib
  * @run main/othervm gc.z.TestAllocateHeapAt . true
--- a/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /*
  * @test TestAlwaysPreTouch
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC parallel pre-touch
  * @run main/othervm -XX:+UseZGC -Xlog:gc* -XX:-AlwaysPreTouch -Xms128M -Xmx128M gc.z.TestAlwaysPreTouch
  * @run main/othervm -XX:+UseZGC -Xlog:gc* -XX:+AlwaysPreTouch -XX:ParallelGCThreads=1 -Xms2M -Xmx128M gc.z.TestAlwaysPreTouch
--- a/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java	Fri Jul 10 23:12:29 2020 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test TestGarbageCollectorMXBean
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC garbage collector MXBean
  * @modules java.management
  * @run main/othervm -XX:+UseZGC -Xms256M -Xmx512M -Xlog:gc TestGarbageCollectorMXBean 256 512
--- a/test/hotspot/jtreg/gc/z/TestHighUsage.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestHighUsage.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /*
  * @test TestHighUsage
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC "High Usage" rule
  * @library /test/lib
  * @run main/othervm gc.z.TestHighUsage
--- a/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java	Fri Jul 10 23:12:29 2020 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test TestMemoryMXBean
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC heap memory MXBean
  * @modules java.management
  * @run main/othervm -XX:+UseZGC -Xms128M -Xmx256M -Xlog:gc* TestMemoryMXBean 128 256
--- a/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java	Fri Jul 10 23:12:29 2020 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test TestMemoryManagerMXBean
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC memory manager MXBean
  * @modules java.management
  * @run main/othervm -XX:+UseZGC -Xmx128M TestMemoryManagerMXBean
--- a/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /*
  * @test TestPageCacheFlush
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC page cache flushing
  * @library /test/lib
  * @run driver gc.z.TestPageCacheFlush
--- a/test/hotspot/jtreg/gc/z/TestSmallHeap.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestSmallHeap.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,7 +25,7 @@
 
 /*
  * @test TestSmallHeap
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC with small heaps
  * @library / /test/lib
  * @run driver gc.z.TestSmallHeap 8M 16M 32M 64M 128M 256M 512M 1024M
--- a/test/hotspot/jtreg/gc/z/TestUncommit.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/gc/z/TestUncommit.java	Fri Jul 10 23:12:29 2020 -0700
@@ -25,21 +25,21 @@
 
 /*
  * @test TestUncommit
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC uncommit unused memory
  * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms128M -Xmx512M -XX:ZUncommitDelay=10 gc.z.TestUncommit true 2
  */
 
 /*
  * @test TestUncommit
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC uncommit unused memory
  * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms512M -Xmx512M -XX:ZUncommitDelay=10 gc.z.TestUncommit false 1
  */
 
 /*
  * @test TestUncommit
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test ZGC uncommit unused memory
  * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms128M -Xmx512M -XX:ZUncommitDelay=10 -XX:-ZUncommit gc.z.TestUncommit false 1
  */
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java	Fri Jul 10 23:12:29 2020 -0700
@@ -28,8 +28,6 @@
  * @requires vm.gc.Z
  * @requires vm.gc.Serial
  * @requires vm.gc == null
- * @comment Graal does not support ZGC
- * @requires !vm.graal.enabled
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @compile test-classes/Hello.java
  * @run driver TestZGCWithCDS
--- a/test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpCompressedTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpCompressedTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -72,7 +72,7 @@
 
 /*
  * @test
- * @requires vm.gc.Z & !vm.graal.enabled
+ * @requires vm.gc.Z
  * @summary Test of diagnostic command GC.heap_dump with gzipped output (Z GC)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -84,7 +84,7 @@
 
 /*
  * @test
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @summary Test of diagnostic command GC.heap_dump with gzipped output (Shenandoah GC)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -96,7 +96,7 @@
 
 /*
  * @test
- * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @requires vm.gc.Epsilon
  * @summary Test of diagnostic command GC.heap_dump with gzipped output (Epsilon GC)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle01/Juggle01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle01/Juggle01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp byteArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp byteArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp byteArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp byteArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle05/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle05/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle06/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle06/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp booleanArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle07/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle07/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp shortArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle08/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle08/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp shortArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle09/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle09/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp shortArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle10/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle10/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp charArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle11/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle11/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp charArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle12/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle12/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp charArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle13/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle13/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp intArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle14/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle14/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp intArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle15/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle15/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp intArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle16/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle16/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp longArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle17/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle17/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp longArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle18/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle18/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp longArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle19/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle19/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp floatArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle20/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle20/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp floatArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle21/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle21/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp floatArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle22/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle22/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp doubleArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle23/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle23/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp doubleArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle24/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle24/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp doubleArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle25/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle25/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp objectArr -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle26/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle26/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp objectArr -ms medium
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle27/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle27/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.ArrayJuggle.Juggle01.Juggle01 -gp objectArr -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle28/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle28/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle29/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle29/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle30/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle30/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle31/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle31/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle32/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle32/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle33/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle33/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle34/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/ArrayJuggle/Juggle34/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc=debug:gc.log
  *      gc.ArrayJuggle.Juggle01.Juggle01
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/AllocateWithoutOomTest/AllocateWithoutOomTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/AllocateWithoutOomTest/AllocateWithoutOomTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      gc.gctests.AllocateWithoutOomTest.AllocateWithoutOomTest
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/BigChains/BigChains.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/BigChains/BigChains.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.BigChains.BigChains
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/CallGC/CallGC01/CallGC01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/CallGC/CallGC01/CallGC01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.CallGC.CallGC01.CallGC01 -t 100
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/CallGC/CallGC02/CallGC02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/CallGC/CallGC02/CallGC02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.CallGC.CallGC02.CallGC02 -t 100 -gp random(arrays)
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/ClassDeallocGC/ClassDeallocGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/ClassDeallocGC/ClassDeallocGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -48,7 +48,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.ClassDeallocGC.ClassDeallocGC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest01/FinalizeTest01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest01/FinalizeTest01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.FinalizeTest01.FinalizeTest01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      gc.gctests.FinalizeTest01.FinalizeTest01
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest04/FinalizeTest04.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest04/FinalizeTest04.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.FinalizeTest04.FinalizeTest04
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest05/FinalizeTest05.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizeTest05/FinalizeTest05.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.FinalizeTest05.FinalizeTest05
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizerGC01/FinalizerGC01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizerGC01/FinalizerGC01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -35,7 +35,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.FinalizerGC01.FinalizerGC01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizerGC02/FinalizerGC02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/FinalizerGC02/FinalizerGC02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -34,7 +34,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.FinalizerGC02.FinalizerGC02
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/GcPointerCheckTest/GcPointerCheckTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/GcPointerCheckTest/GcPointerCheckTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.GcPointerCheckTest.GcPointerCheckTest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/HeapUsageTest/HeapUsageTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/HeapUsageTest/HeapUsageTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.HeapUsageTest.HeapUsageTest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/InterruptGC/InterruptGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/InterruptGC/InterruptGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.InterruptGC.InterruptGC -gp random(arrays) -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/JumbleGC/JumbleGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/JumbleGC/JumbleGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.JumbleGC.JumbleGC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/JumbleGC002/JumbleGC002.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/JumbleGC002/JumbleGC002.java	Fri Jul 10 23:12:29 2020 -0700
@@ -50,7 +50,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.JumbleGC002.JumbleGC002
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java	Fri Jul 10 23:12:29 2020 -0700
@@ -55,7 +55,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
  * @run driver nsk.share.gc.GenClassesBuilder
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -56,7 +56,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
  * @run driver nsk.share.gc.GenClassesBuilder
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -60,7 +60,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
  * @run driver nsk.share.gc.GenClassesBuilder
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -60,7 +60,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
  * @run driver nsk.share.gc.GenClassesBuilder
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -60,7 +60,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
  * @run driver nsk.share.gc.GenClassesBuilder
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC/LoadUnloadGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC/LoadUnloadGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.share.gc.ClassChain
  * @run main/othervm
  *      -XX:MaxMetaspaceSize=64M
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC2/LoadUnloadGC2.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LoadUnloadGC2/LoadUnloadGC2.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.LoadUnloadGC2.LoadUnloadGC2
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/MTLinkedListGC/MTLinkedListGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/MTLinkedListGC/MTLinkedListGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.MTLinkedListGC.MTLinkedListGC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/MTasyncGC/MTasyncGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/MTasyncGC/MTasyncGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.MTasyncGC.MTasyncGC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/MTsyncGC/MTsyncGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/MTsyncGC/MTsyncGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.MTsyncGC.MTsyncGC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/MatrixJuggleGC/MatrixJuggleGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/MatrixJuggleGC/MatrixJuggleGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -79,7 +79,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.MatrixJuggleGC.MatrixJuggleGC -iterations 1000000
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/MemoryEater/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/MemoryEater/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.MemoryEaterMT.MemoryEaterMT -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.MemoryEaterMT.MemoryEaterMT
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/ObjectMonitorCleanup/ObjectMonitorCleanup.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/ObjectMonitorCleanup/ObjectMonitorCleanup.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.ObjectMonitorCleanup.ObjectMonitorCleanup
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/OneeFinalizerTest/OneeFinalizerTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/OneeFinalizerTest/OneeFinalizerTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      -Xlog:gc:gc.log
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/PhantomReferenceEvilTest/PhantomReferenceEvilTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/PhantomReferenceEvilTest/PhantomReferenceEvilTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -39,7 +39,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      gc.gctests.PhantomReference.PhantomReferenceEvilTest.PhantomReferenceEvilTest
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/PhantomReferenceTest/PhantomReferenceTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/PhantomReferenceTest/PhantomReferenceTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      gc.gctests.PhantomReference.PhantomReferenceTest.PhantomReferenceTest
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom001/phantom001.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom001/phantom001.java	Fri Jul 10 23:12:29 2020 -0700
@@ -54,7 +54,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.PhantomReference.phantom001.phantom001 -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom002/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom002/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -55,7 +55,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.PhantomReference.phantom001.phantom001 -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/ReferencesGC/ReferencesGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/ReferencesGC/ReferencesGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      gc.gctests.ReferencesGC.ReferencesGC
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/RememberedSet/RememberedSet.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/RememberedSet/RememberedSet.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.RememberedSet.RememberedSet
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/SoftReferenceTest/SoftReferenceTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/SoftReferenceTest/SoftReferenceTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.SoftReference.SoftReferenceTest.SoftReferenceTest -stressTime 600
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft001/soft001.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft001/soft001.java	Fri Jul 10 23:12:29 2020 -0700
@@ -51,7 +51,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.SoftReference.soft001.soft001 -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft002/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft002/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -52,7 +52,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.SoftReference.soft001.soft001 -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft003/soft003.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft003/soft003.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.SoftReference.soft003.soft003 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft004/soft004.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft004/soft004.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.SoftReference.soft004.soft004 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft005/soft005.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft005/soft005.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.SoftReference.soft005.soft005 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringGC/StringGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringGC/StringGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.StringGC.StringGC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringIntern/StringIntern.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringIntern/StringIntern.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.StringIntern.StringIntern
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternGC/StringInternGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternGC/StringInternGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.StringInternGC.StringInternGC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSync/StringInternSync.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSync/StringInternSync.java	Fri Jul 10 23:12:29 2020 -0700
@@ -35,7 +35,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:+UnlockDiagnosticVMOptions
  *      -XX:+VerifyStringTableAtExit
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSync2/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSync2/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.StringInternSync.StringInternSync -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC/StringInternSyncWithGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC/StringInternSyncWithGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -35,7 +35,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc:gc.log
  *      gc.gctests.StringInternSyncWithGC.StringInternSyncWithGC
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC2/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC2/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc:gc.log
  *      gc.gctests.StringInternSyncWithGC.StringInternSyncWithGC
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC3/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC3/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc:gc.log
  *      gc.gctests.StringInternSyncWithGC.StringInternSyncWithGC
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC4/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/StringInternSyncWithGC4/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -Xlog:gc:gc.log
  *      gc.gctests.StringInternSyncWithGC.StringInternSyncWithGC
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/ThreadGC/ThreadGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/ThreadGC/ThreadGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.ThreadGC.ThreadGC -gp random(arrays) -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/WeakReferenceEvilTest/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/WeakReferenceEvilTest/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -40,7 +40,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.WeakReference.WeakReferenceEvilTest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/WeakReferenceTest/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/WeakReferenceTest/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.WeakReference.WeakReferenceTest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak001/weak001.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak001/weak001.java	Fri Jul 10 23:12:29 2020 -0700
@@ -51,7 +51,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.WeakReference.weak001.weak001 -ms low
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak002/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak002/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -52,7 +52,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.WeakReference.weak001.weak001 -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak003/weak003.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak003/weak003.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.WeakReference.weak003.weak003 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak004/weak004.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak004/weak004.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.WeakReference.weak004.weak004 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak005/weak005.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak005/weak005.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.WeakReference.weak005.weak005 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.WeakReference.weak006.weak006 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak007/weak007.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak007/weak007.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.gctests.WeakReference.weak007.weak007 -t 1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReferenceGC/WeakReferenceGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReferenceGC/WeakReferenceGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -82,7 +82,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      gc.gctests.WeakReferenceGC.WeakReferenceGC
  *      -numList 50
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/fileTest/fileTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/fileTest/fileTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.fileTest.fileTest -Filename fileTest.java -iterations 500
  */
 
@@ -38,6 +37,7 @@
 
 import java.io.*;
 import java.util.*;
+import jdk.test.lib.Utils;
 import nsk.share.test.*;
 import nsk.share.gc.*;
 import nsk.share.TestBug;
@@ -60,9 +60,9 @@
 
         public void runIteration() throws IOException {
                 for (int i = 0; i < fileNumber; ++i)
-                        fileArray[i] = new File(fileName);
+                        fileArray[i] = new File(Utils.TEST_SRC, fileName);
                 for (int i = 0; i < inputStreamNumber; ++i)
-                        fileInputArray[i] = new FileInputStream(fileName);
+                        fileInputArray[i] = new FileInputStream(Utils.TEST_SRC + File.separator + fileName);
                 for (int i = 0; i < inputStreamNumber; ++i)
                         fileInputArray[i].close();
         }
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest01/gctest01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest01/gctest01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.gctest01.gctest01 100 10
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest02/gctest02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest02/gctest02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -32,7 +32,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.gctests.gctest02.gctest02 100
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest03/gctest03.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest03/gctest03.java	Fri Jul 10 23:12:29 2020 -0700
@@ -43,7 +43,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @compile Tree.java appthread.java
  * @run main/othervm gc.gctests.gctest03.gctest03 10000
  */
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest04/gctest04.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/gctest04/gctest04.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @compile reqgen.java
  * @run main/othervm gc.gctests.gctest04.gctest04
  */
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC1/mallocWithGC1.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC1/mallocWithGC1.java	Fri Jul 10 23:12:29 2020 -0700
@@ -46,7 +46,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native/timeout=300 gc.gctests.mallocWithGC1.mallocWithGC1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC2/mallocWithGC2.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC2/mallocWithGC2.java	Fri Jul 10 23:12:29 2020 -0700
@@ -50,7 +50,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native gc.gctests.mallocWithGC2.mallocWithGC2
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC3/mallocWithGC3.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC3/mallocWithGC3.java	Fri Jul 10 23:12:29 2020 -0700
@@ -50,7 +50,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native/timeout=300 gc.gctests.mallocWithGC3.mallocWithGC3
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC01/nativeGC01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC01/nativeGC01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -39,7 +39,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native gc.gctests.nativeGC01.nativeGC01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC02/nativeGC02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC02/nativeGC02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -32,7 +32,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native gc.gctests.nativeGC02.nativeGC02
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC03/nativeGC03.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC03/nativeGC03.java	Fri Jul 10 23:12:29 2020 -0700
@@ -39,7 +39,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native gc.gctests.nativeGC03.nativeGC03
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC05/nativeGC05.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC05/nativeGC05.java	Fri Jul 10 23:12:29 2020 -0700
@@ -80,7 +80,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native gc.gctests.nativeGC05.nativeGC05
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/hashcode/ExternalHashingTest/ExternalHashingTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/hashcode/ExternalHashingTest/ExternalHashingTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -47,7 +47,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.hashcode.ExternalHashingTest.ExternalHashingTest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeSimpleTest/HashCodeSimpleTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeSimpleTest/HashCodeSimpleTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.hashcode.HashCodeSimpleTest.HashCodeSimpleTest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestC/HashCodeTestC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestC/HashCodeTestC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.hashcode.HashCodeTestC.HashCodeTestC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestCC/HashCodeTestCC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestCC/HashCodeTestCC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.hashcode.HashCodeTestCC.HashCodeTestCC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestP/HashCodeTestP.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestP/HashCodeTestP.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.hashcode.HashCodeTestP.HashCodeTestP
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestPC/HashCodeTestPC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/hashcode/HashCodeTestPC/HashCodeTestPC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -37,7 +37,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.hashcode.HashCodeTestPC.HashCodeTestPC
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/Access/access.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/Access/access.java	Fri Jul 10 23:12:29 2020 -0700
@@ -47,7 +47,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-UseGCOverheadLimit gc.huge.quicklook.largeheap.Access.access
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jni/jnilock001/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jni/jnilock001/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jni/jnilock002/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jni/jnilock002/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jni/jnilock003/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jni/jnilock003/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock01/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock01/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniglobalreflock04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock01/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock01/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnilocalreflock04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock01/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock01/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jnireflock04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native -XX:-UseGCOverheadLimit gc.lock.LockerTest -gp1 class -lockers jniRef
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock01/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock01/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jniref/jniweakglobalreflock04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock01/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock01/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      -agentlib:JVMTIAllocLocker
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      -agentlib:JVMTIAllocLocker
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      -agentlib:JVMTIAllocLocker
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      -agentlib:JVMTIAllocLocker
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock01/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock01/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
  *      -XX:-UseGCOverheadLimit
  *      gc.lock.LockerTest
--- a/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native -XX:-UseGCOverheadLimit gc.lock.LockerTest -gp1 class -lockers malloc
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle1/Juggle1.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle1/Juggle1.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.memory.Array.ArrayJuggle.Juggle1.Juggle1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle1_gc/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle1_gc/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.memory.Array.ArrayJuggle.Juggle1.Juggle1 -tg
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle2/Juggle2.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle2/Juggle2.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.memory.Array.ArrayJuggle.Juggle2.Juggle2
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle2_gc/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Array/ArrayJuggle/Juggle2_gc/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -Xlog:gc=debug:gc.log gc.memory.Array.ArrayJuggle.Juggle2.Juggle2 -tg
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Array/SampleMe/SampleMe.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Array/SampleMe/SampleMe.java	Fri Jul 10 23:12:29 2020 -0700
@@ -49,7 +49,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.Array.SampleMe.SampleMe
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn1/Churn1.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn1/Churn1.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.Churn.Churn1.Churn1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn2/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn2/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.Churn.Churn1.Churn1 -l 1000 -tg
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn3/Churn3.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn3/Churn3.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.Churn.Churn3.Churn3
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn3a/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn3a/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.Churn.Churn3.Churn3 -tg -tf
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn4/Churn4.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Churn/Churn4/Churn4.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.Churn.Churn4.Churn4
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/FillingStation/FillingStation.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/FillingStation/FillingStation.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.FillingStation.FillingStation
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/LargePagesTest/LargePagesTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/LargePagesTest/LargePagesTest.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.LargePagesTest.LargePagesTest noThreads=5 duration=60
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/Nio/Nio.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/Nio/Nio.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:MaxDirectMemorySize=50M gc.memory.Nio.Nio
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular1/Circular1.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular1/Circular1.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Circular1.Circular1 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular2/Circular2.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular2/Circular2.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Circular2.Circular2 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular3/Circular3.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular3/Circular3.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Circular3.Circular3 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular4/Circular4.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Circular4/Circular4.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Circular4.Circular4 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear1/Linear1.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear1/Linear1.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Linear1.Linear1 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear2/Linear2.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear2/Linear2.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Linear2.Linear2 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear3/Linear3.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear3/Linear3.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Linear3.Linear3 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear4/Linear4.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/memory/UniThread/Linear4/Linear4.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.memory.UniThread.Linear4.Linear4 -iterations 5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListHigh/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListHigh/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms high -gp circularList(high)
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListLow/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListLow/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms low -gp circularList(low)
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/DoubleArrayHigh/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/DoubleArrayHigh/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms high -gp doubleArr
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/DoubleArrayLow/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/DoubleArrayLow/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms low -gp doubleArr
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/FloatArrayHigh/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/FloatArrayHigh/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms low -gp floatArr
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/FloatArrayLow/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/FloatArrayLow/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms low -gp floatArr
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListHigh/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListHigh/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms high -gp linearList(high)
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListLow/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListLow/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms low -gp linearList(low)
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/NonbranchyTreeHigh/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/NonbranchyTreeHigh/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms high -gp nonbranchyTree(high)
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/NonbranchyTreeLow/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/NonbranchyTreeLow/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms high -gp nonbranchyTree(low)
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/ObjectArrayHigh/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/ObjectArrayHigh/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms low -gp objectArr
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/ObjectArrayLow/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/ObjectArrayLow/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms high -gp objectArr
  */
 
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/SimpleGC/SimpleGC.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/SimpleGC/SimpleGC.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms high
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayBounds/ArrayBounds.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayBounds/ArrayBounds.java	Fri Jul 10 23:12:29 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.Arrays.ArrayBounds.ArrayBounds
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayStoreCheck/ArrayStoreCheck.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayStoreCheck/ArrayStoreCheck.java	Fri Jul 10 23:12:29 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
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.Arrays.ArrayStoreCheck.ArrayStoreCheck
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayTests/ArrayTests.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/Arrays/ArrayTests/ArrayTests.java	Fri Jul 10 23:12:29 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
@@ -33,7 +33,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.Arrays.ArrayTests.ArrayTests
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/CEETest/CEETest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/CEETest/CEETest.java	Fri Jul 10 23:12:29 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.CEETest.CEETest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/CondExpr/CondExpr.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/CondExpr/CondExpr.java	Fri Jul 10 23:12:29 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
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.CondExpr.CondExpr
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java	Fri Jul 10 23:12:29 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
@@ -32,7 +32,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.DivTest.DivTest
  * @run driver ExecDriver --java jit.DivTest.DivTest
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/ExcOpt/ExcOpt.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/ExcOpt/ExcOpt.java	Fri Jul 10 23:12:29 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
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.ExcOpt.ExcOpt
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Filtering.Filtering
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Filtering.Filtering
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Loops01.Loops01
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops01.Loops01
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.FloatingPoint.gen_math.Loops02.Loops02
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops02.Loops02
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.FloatingPoint.gen_math.Loops03.Loops03
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops03.Loops03
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Loops04.Loops04
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops04.Loops04
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Loops05.Loops05
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops05.Loops05
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Loops06.Loops06
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops06.Loops06
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Loops07.Loops07
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops07.Loops07
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Matrix_3d.Matrix_3d
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Matrix_3d.Matrix_3d
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/ShortCircuitTest/ShortCircuitTest.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/ShortCircuitTest/ShortCircuitTest.java	Fri Jul 10 23:12:29 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.gen_math.ShortCircuitTest.ShortCircuitTest
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.FloatingPoint.gen_math.Summ.Summ
  * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Summ.Summ
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/PrintProperties/PrintProperties.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/PrintProperties/PrintProperties.java	Fri Jul 10 23:12:29 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.PrintProperties.PrintProperties
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/PrintThis/PrintThis.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/PrintThis/PrintThis.java	Fri Jul 10 23:12:29 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.PrintThis.PrintThis
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.Robert.Robert
  * @run driver ExecDriver --java jit.Robert.Robert
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.Sleeper.Sleeper
  * @run driver ExecDriver --java jit.Sleeper.Sleeper
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.bounds.bounds
  * @run driver ExecDriver --java jit.bounds.bounds
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test01.test01
  * @run driver ExecDriver --java jit.deoptimization.test01.test01
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test02.test02
  * @run driver ExecDriver --java jit.deoptimization.test02.test02
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test03.test03
  * @run driver ExecDriver --java jit.deoptimization.test03.test03
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test04.test04
  * @run driver ExecDriver --java jit.deoptimization.test04.test04
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test05.test05
  * @run driver ExecDriver --java jit.deoptimization.test05.test05
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test06.test06
  * @run driver ExecDriver --java jit.deoptimization.test06.test06
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test07.test07
  * @run driver ExecDriver --java jit.deoptimization.test07.test07
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.deoptimization.test08.test08
  * @run driver ExecDriver --java jit.deoptimization.test08.test08
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.escape.AdaptiveBlocking.AdaptiveBlocking001.AdaptiveBlocking001
  * @run driver/timeout=300 ExecDriver --java -server -Xcomp -XX:+DoEscapeAnalysis
  *             jit.escape.AdaptiveBlocking.AdaptiveBlocking001.AdaptiveBlocking001 -numRounds 10
--- a/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java	Fri Jul 10 23:12:29 2020 -0700
@@ -41,7 +41,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.escape.LockElision.MatMul.MatMul
  * @run driver ExecDriver --java jit.escape.LockElision.MatMul.MatMul -dim 30 -threadCount 10
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.exception.exception
  * @run driver ExecDriver --java jit.exception.exception
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java	Fri Jul 10 23:12:29 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
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.init.init01.init01
  * @run driver ExecDriver --java jit.init.init01.init01
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java	Fri Jul 10 23:12:29 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
@@ -35,7 +35,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.init.init02.init02
  * @run driver ExecDriver --java jit.init.init02.init02
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/inline/inline005/inline005.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline005/inline005.java	Fri Jul 10 23:12:29 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
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.inline.inline005.inline005
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/misctests/JitBug1/JitBug1.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/JitBug1/JitBug1.java	Fri Jul 10 23:12:29 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.misctests.JitBug1.JitBug1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java	Fri Jul 10 23:12:29 2020 -0700
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build jit.misctests.Pi.Pi
  * @run driver ExecDriver --java jit.misctests.Pi.Pi
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/misctests/clss14702/clss14702.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/clss14702/clss14702.java	Fri Jul 10 23:12:29 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.misctests.clss14702.clss14702
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphApplet.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/fpustack/GraphApplet.java	Fri Jul 10 23:12:29 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
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.misctests.fpustack.GraphApplet
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/misctests/putfield00802/putfield00802.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/putfield00802/putfield00802.java	Fri Jul 10 23:12:29 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.misctests.putfield00802.putfield00802
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.misctests.t5.t5
  * @run driver ExecDriver --java jit.misctests.t5.t5
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.overflow.overflow
  * @run driver ExecDriver --java jit.overflow.overflow
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/regression/CrashC1/CrashC1.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/regression/CrashC1/CrashC1.java	Fri Jul 10 23:12:29 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.regression.CrashC1.CrashC1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/regression/b4427606/b4427606.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/regression/b4427606/b4427606.java	Fri Jul 10 23:12:29 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
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.regression.b4427606.b4427606
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/regression/b4446672/b4446672.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/regression/b4446672/b4446672.java	Fri Jul 10 23:12:29 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
@@ -30,7 +30,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm jit.regression.b4446672.b4446672
  */
 
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t007.t007
  * @run driver ExecDriver --java jit.t.t007.t007
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t008.t008
  * @run driver ExecDriver --java jit.t.t008.t008
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t009.t009
  * @run driver ExecDriver --java jit.t.t009.t009
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t012.t012
  * @run driver ExecDriver --java jit.t.t012.t012
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t014.t014
  * @run driver ExecDriver --java jit.t.t014.t014
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t026.t026
  * @run driver ExecDriver --java jit.t.t026.t026
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t041.t041
  * @run driver ExecDriver --java jit.t.t041.t041
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t044.t044
  * @run driver ExecDriver --java jit.t.t044.t044
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t045.t045
  * @run driver ExecDriver --java jit.t.t045.t045
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t050.t050
  * @run driver ExecDriver --java jit.t.t050.t050
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.t.t066.t066
  * @run driver ExecDriver --java jit.t.t066.t066
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java	Fri Jul 10 23:12:29 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 . .
  * @compile VerifyInitLocal1P.jasm
  * @compile VerifyInitLocal2N.jasm
  * @compile VerifyInitLocal3N.jasm
--- a/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java	Fri Jul 10 23:12:29 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 . .
  * @compile MergeStack.jasm
  * @run main/othervm jit.verifier.VerifyMergeStack.VerifyMergeStack
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.wide.wide01.wide01
  * @run driver ExecDriver --java jit.wide.wide01.wide01
  */
--- a/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java	Fri Jul 10 23:12:29 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 . .
  * @build jit.wide.wide02.wide02
  * @run driver ExecDriver --java jit.wide.wide02.wide02
  */
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit001/uninit001.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit001/uninit001.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit001.uninit001
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit002/uninit002.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit002/uninit002.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit002.uninit002
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit003/uninit003.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit003/uninit003.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit003.uninit003
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit004/uninit004.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit004/uninit004.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit004.uninit004
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit005/uninit005.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit005/uninit005.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit005.uninit005
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit006/uninit006.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit006/uninit006.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit006.uninit006
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit007/uninit007.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit007/uninit007.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit007.uninit007
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit008/uninit008.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit008/uninit008.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit008.uninit008
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit009/uninit009.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit009/uninit009.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit009.uninit009
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit010/uninit010.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit010/uninit010.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit010.uninit010
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit011/uninit011.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit011/uninit011.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit011.uninit011
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit012/uninit012.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit012/uninit012.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit012.uninit012
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit013/uninit013.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/uninit/uninit013/uninit013.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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
@@ -29,7 +29,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @build vm.compiler.complog.share.LogCompilationTest
  *        vm.compiler.complog.uninit.uninit013.uninit013
  *        vm.compiler.complog.uninit.UninitializedTrapCounter
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -46,7 +46,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm vm.compiler.coverage.parentheses.Parentheses
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop01/constprop01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop01/constprop01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.constprop.constprop01.constprop01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.constprop.constprop02.constprop02
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead01/dead01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead01/dead01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead01.dead01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead02/dead02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead02/dead02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead02.dead02
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead03/dead03.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead03/dead03.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead03.dead03
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead04/dead04.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead04/dead04.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead04.dead04
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead05/dead05.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead05/dead05.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead05.dead05
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead06/dead06.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead06/dead06.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead06.dead06
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead07/dead07.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead07/dead07.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead07.dead07
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead08/dead08.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead08/dead08.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead08.dead08
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead09/dead09.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead09/dead09.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead09.dead09
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead10/dead10.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead10/dead10.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead10.dead10
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead11/dead11.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead11/dead11.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead11.dead11
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead12/dead12.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead12/dead12.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead12.dead12
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead13/dead13.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead13/dead13.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead13.dead13
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead14/dead14.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead14/dead14.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead14.dead14
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead15/dead15.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead15/dead15.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead15.dead15
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead16/dead16.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/dead/dead16/dead16.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.dead.dead16.dead16
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist01/hoist01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist01/hoist01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.hoist.hoist01.hoist01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist02/hoist02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist02/hoist02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.hoist.hoist02.hoist02
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist03/hoist03.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist03/hoist03.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.hoist.hoist03.hoist03
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist04/hoist04.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/hoist/hoist04/hoist04.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.hoist.hoist04.hoist04
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon01/subcommon01.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon01/subcommon01.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.subcommon.subcommon01.subcommon01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon02/subcommon02.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon02/subcommon02.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm vm.compiler.jbe.subcommon.subcommon02.subcommon02
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon03/subcommon03.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon03/subcommon03.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.subcommon.subcommon03.subcommon03
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon04/subcommon04.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon04/subcommon04.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.subcommon.subcommon04.subcommon04
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon05/subcommon05.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/subcommon/subcommon05/subcommon05.java	Fri Jul 10 23:12:29 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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 vm.compiler.jbe.subcommon.subcommon05.subcommon05
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_disabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_disabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.explicit.Explicit01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_enabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Explicit01/cs_enabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.explicit.Explicit01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_disabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_disabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.explicit.Merge01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_enabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/explicit/Merge01/cs_enabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.explicit.Merge01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_disabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_disabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.implicit.Implicit01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_enabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Implicit01/cs_enabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.implicit.Implicit01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_disabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_disabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:-CompactStrings vm.compiler.optimizations.stringconcat.implicit.Merge01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_enabled/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/optimizations/stringconcat/implicit/Merge01/cs_enabled/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -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 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm -XX:+CompactStrings vm.compiler.optimizations.stringconcat.implicit.Merge01
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_ArrayOf/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_ArrayOf/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_ArrayOf1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_ArrayOf1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_TwoFields/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_TwoFields/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_TwoFields1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Arrays_TwoFields1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings_NonbranchyTree/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings_NonbranchyTree/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings_Strings/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_InternedStrings_Strings/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_ArrayOf/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_ArrayOf/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_ArrayOf1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_ArrayOf1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_TwoFields/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_TwoFields/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_TwoFields1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_NonbranchyTree_TwoFields1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_ArrayOf/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_ArrayOf/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_ArrayOf1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_ArrayOf1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_InternedStrings/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_InternedStrings/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_TwoFields/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_TwoFields/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_TwoFields1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_Strings_TwoFields1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_TwoFields_InternedStrings/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Compact_TwoFields_InternedStrings/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Arrays1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Arrays1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Arrays5M/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Arrays5M/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_InternedStrings/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_InternedStrings/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_InternedStrings1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_InternedStrings1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_NonbranchyTree/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_NonbranchyTree/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_NonbranchyTree1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_NonbranchyTree1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_NonbranchyTree5M/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_NonbranchyTree5M/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Strings/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Strings/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Strings1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/compact/Humongous_Strings1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -36,7 +36,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.compact.Compact
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp0mr30st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp0mr30st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp0mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp0mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr0st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr0st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr30st0t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr30st0t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr70st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr70st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp30mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp70mr30st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp70mr30st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp70mr30st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp0rp70mr30st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp0mr30st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp0mr30st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp0mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp0mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr0st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr0st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr30st0t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr30st0t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr70st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr70st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp30mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp70mr30st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp70mr30st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp70mr30st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp10rp70mr30st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp0mr30st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp0mr30st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp0mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp0mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr0st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr0st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr30st0t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr30st0t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr70st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr70st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp30mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp70mr30st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp70mr30st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp70mr30st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp30yp25rp70mr30st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp0mr30st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp0mr30st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp0mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp0mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr0st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr0st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr30st0t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr30st0t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr70st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr70st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp30mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp70mr30st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp70mr30st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp70mr30st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp0rp70mr30st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp0mr30st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp0mr30st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp0mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp0mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr0st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr0st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr30st0t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr30st0t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr70st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr70st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr70st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp30mr70st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp70mr30st0/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp70mr30st0/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp70mr30st300t1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp50yp10rp70mr30st300t1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp60yp0rp30mr0st300/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/lp60yp0rp30mr0st300/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.concurrent.Concurrent
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination01/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination01/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination02/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination02/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination03/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination03/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination04/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination04/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination05/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/Combination05/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/ConcurrentHashMap_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/ConcurrentHashMap_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/HashMap_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/HashMap_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/LinkedBlockingDeque_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/LinkedBlockingDeque_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/LinkedHashMap_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/LinkedHashMap_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/LinkedList_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/LinkedList_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/TreeMap_Arrays/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/TreeMap_Arrays/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -32,7 +32,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/containers/TreeSet_String/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/containers/TreeSet_String/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
  *      vm.gc.containers.ContainersTest
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc1
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc10
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc11
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc12
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc13
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc14
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc15
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc16
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc17
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc18
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc19
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc2
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc20
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc21
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc22
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc23
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc24
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc25
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc26
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc27
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc28
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc29
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc3
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc30
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc31
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc32
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc33
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc34
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc35
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc36
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc37
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc38
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc39
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc4
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc40
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc41
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc42
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc43
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc44
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc45
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc46
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc47
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc48
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc49
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc5
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc50
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc51
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc52
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc6
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc7
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc8
  */
 
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java	Fri Jul 10 23:12:29 2020 -0700
@@ -31,7 +31,6 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run driver jdk.test.lib.FileInstaller . .
  * @run main/native/othervm vm.jit.LongTransitions.LTTest nativeFnc9
  */
 
--- a/test/jtreg-ext/requires/VMProps.java	Fri Jul 10 11:40:57 2020 -0400
+++ b/test/jtreg-ext/requires/VMProps.java	Fri Jul 10 23:12:29 2020 -0700
@@ -268,18 +268,36 @@
         return CPUInfo.getFeatures().toString();
     }
 
+    private boolean isGcSupportedByGraal(GC gc) {
+        switch (gc) {
+            case Serial:
+            case Parallel:
+            case G1:
+                return true;
+            case Epsilon:
+            case Z:
+            case Shenandoah:
+                return false;
+            default:
+                throw new IllegalStateException("Unknown GC " + gc.name());
+        }
+    }
+
     /**
      * For all existing GC sets vm.gc.X property.
      * Example vm.gc.G1=true means:
      *    VM supports G1
      *    User either set G1 explicitely (-XX:+UseG1GC) or did not set any GC
+     *    G1 can be selected, i.e. it doesn't conflict with other VM flags
      *
      * @param map - property-value pairs
      */
     protected void vmGC(SafeMap map) {
+        var isGraalEnabled = Compiler.isGraalEnabled();
         for (GC gc: GC.values()) {
             map.put("vm.gc." + gc.name(),
                     () -> "" + (gc.isSupported()
+                            && (!isGraalEnabled || isGcSupportedByGraal(gc))
                             && (gc.isSelected() || GC.isSelectedErgonomically())));
         }
     }