8252774: remove jdk.test.lib.FileInstaller action from graalunit tests

Reviewed-by: shade, epavlova

test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/ApiTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/Core01Test.java

@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  * @requires !vm.graal.enabled
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[a-cA-C] -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[a-cA-C] -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/Core02Test.java

@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  * @requires !vm.graal.enabled
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[d-zD-Z] -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[d-zD-Z] -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/DebugTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/EATest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/GraphTest.java

@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=jdk.internal.vm.compiler/org.graalvm.graphio=ALL-UNNAMED
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt -vmargs --add-opens=jdk.internal.vm.compiler/org.graalvm.graphio=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/HotspotJdk15Test.java

@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk15.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk15.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java

@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/HotspotTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[a-lA-L] -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[a-lA-L] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[n-zN-Z] -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[n-zN-Z] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[a-eA-E] -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[a-eA-E] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[g-zG-Z] -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[g-zG-Z] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/LirJttTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/LirTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/LoopTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/NodesTest.java

@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/OptionsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java

@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/UtilTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ${test.root}/ProblemList-graal.txt
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

test/hotspot/jtreg/compiler/graalunit/generateTests.sh

@@ -30,47 +30,47 @@ do
    flags="-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI"
    requireInfo=""
    vmargs=""
-  
+
    if [ "$#" -ge 2 ] ; then
      fName="$1Test.java"; shift
      pName=$1; shift
-     
+
      echo "Generate $fName for $pName ..."
-     
+
      while [ $# -gt 0 ]; do
         case $1 in
            --requires)
              shift
              requireInfo="@requires $1"
              shift
-           ;;           
+           ;;
-           
+
            --timeout)
              shift
              action="$action/timeout=$1"
              shift
            ;;
-           
+
            --vmargs)
              shift
              vmargs="-vmargs $1"
              shift
            ;;
-           
+
-           * )
+           *)
              echo "WARN: unknown option $1 in line \"$TEST_ARGS\" will be ignored"
              shift
-           ;;  
+           ;;
         esac
      done
   else
      echo "ERROR in line \"$TEST_ARGS\""
   fi
-      
+
-  
+
   cat << EOF | sed 's/[[:blank:]]*$//' > $fName
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -94,20 +94,15 @@ do
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  * $requireInfo
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
+ * @run $action $flags compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude \${test.root}/ProblemList-graal.txt $vmargs
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run $action $flags compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude ExcludeList.txt $vmargs
  */
- 
+
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
 EOF