--- a/test/hotspot/jtreg/ProblemList-graal.txt	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/ProblemList-graal.txt	Mon Apr 08 11:11:22 2019 -0700
@@ -53,8 +53,16 @@
 
 gc/arguments/TestNewSizeFlags.java                              8196611   generic-all
 gc/arguments/TestVerifyBeforeAndAfterGCFlags.java               8196611   generic-all
+gc/g1/mixedgc/TestOldGenCollectionUsage.java                    8196611   generic-all
 gc/g1/TestConcurrentSystemGC.java                               8196611   generic-all
+gc/g1/TestPeriodicCollection.java                               8196611   generic-all
+gc/parallel/TestPrintGCDetailsVerbose.java                      8196611   generic-all
 vmTestbase/gc/lock/malloc/malloclock03/TestDescription.java     8196611   macosx-all
+vmTestbase/nsk/stress/except/except004.java                     8196611   generic-all
+vmTestbase/nsk/stress/except/except007.java                     8196611   generic-all
+vmTestbase/nsk/stress/except/except008.java                     8196611   generic-all
+vmTestbase/nsk/stress/except/except011.java                     8196611   generic-all
+serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorMultiArrayTest.java 8196611   generic-all
 
 gc/g1/ihop/TestIHOPErgo.java                                    8191048   generic-all
 gc/g1/plab/TestPLABEvacuationFailure.java                       8191048   generic-all
@@ -65,8 +73,6 @@
 
 compiler/compilercontrol/directives/LogTest.java                8181753   generic-all
 
-gc/parallel/TestPrintGCDetailsVerbose.java                      8196611   macosx-all
-
 compiler/jvmci/compilerToVM/ReprofileTest.java                  8201333   generic-all
 
 compiler/tiered/LevelTransitionTest.java                         8202124   generic-all

--- a/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/ApiTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.sparc.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.sparc.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/CoreTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/DebugTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/DebugTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/EA9Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/EA9Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test.ea -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test.ea -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/EATest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/EATest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/GraphTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/GraphTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/HotspotSparcTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotSparcTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.sparc.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.sparc.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[a-lA-L] -exclude ExcludeList.txt
+ * @run main 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 */

--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm/timeout=300 compiler.graalunit.common.GraalUnitTestLauncher
- *     -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ExcludeList.txt
+ * @run main/timeout=300 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 */

--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm/timeout=300 compiler.graalunit.common.GraalUnitTestLauncher
- *     -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ExcludeList.txt
+ * @run main/timeout=300 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 */

--- a/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[n-zN-Z] -exclude ExcludeList.txt
+ * @run main 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 */

--- a/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[a-eA-E] -exclude ExcludeList.txt
+ * @run main 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 */

--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[g-zG-Z] -exclude ExcludeList.txt
+ * @run main 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 */

--- a/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/LirTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/LirTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/LoopTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/LoopTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/NodesTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/NodesTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt	Mon Apr 08 11:11:22 2019 -0700
@@ -30,8 +30,8 @@
 JttHotspot    org.graalvm.compiler.jtt.hotspot
 JttJdk        org.graalvm.compiler.jtt.jdk
 JttLangAL     org.graalvm.compiler.jtt.lang.[a-lA-L]
-JttLangMathAL org.graalvm.compiler.jtt.lang.Math_[a-lA-L]
-JttLangMathMZ org.graalvm.compiler.jtt.lang.Math_[m-zM-Z]
+JttLangMathAL org.graalvm.compiler.jtt.lang.Math_[a-lA-L] timeout=300
+JttLangMathMZ org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] timeout=300
 JttLangNZ     org.graalvm.compiler.jtt.lang.[n-zN-Z]
 JttLoop       org.graalvm.compiler.jtt.loop
 Jtt.Micro     org.graalvm.compiler.jtt.micro

--- a/test/hotspot/jtreg/compiler/graalunit/UtilTest.java	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/UtilTest.java	Mon Apr 08 11:11:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,5 +34,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ExcludeList.txt
+ * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ExcludeList.txt
  */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

--- a/test/hotspot/jtreg/compiler/graalunit/generateTests.sh	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/generateTests.sh	Mon Apr 08 11:11:22 2019 -0700
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -22,14 +22,22 @@
 # questions.
 #
 
-while read -r fName pName requireInfo
+while read -r fName pName timeoutInfo requireInfo
 do
   fName="${fName}Test.java"
   echo "Generate $fName for $pName ..."
 
+  action="main"
+  if [[ $timeoutInfo == timeout* ]] ; then
+     action="$action/$timeoutInfo"  
+  else
+     requireInfo="$timeoutInfo $requireInfo"
+  fi
+
+  
   cat << EOF | sed 's/[[:blank:]]*$//' > $fName
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,8 +72,10 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude ExcludeList.txt
+ * @run $action compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude ExcludeList.txt
  */
+ 
+/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
 EOF
 
 done < TestPackages.txt

--- a/test/jdk/ProblemList-graal.txt	Mon Apr 08 19:43:04 2019 +0200
+++ b/test/jdk/ProblemList-graal.txt	Mon Apr 08 11:11:22 2019 -0700
@@ -29,6 +29,8 @@
 
 java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java           8185139   generic-all
 java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java            8185139   generic-all
+java/lang/ProcessBuilder/Basic.java#id0                                 8185139   generic-all
+java/lang/ProcessBuilder/Basic.java#id1                                 8185139   generic-all
 java/lang/ProcessBuilder/SecurityManagerClinit.java                     8185139   generic-all
 java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java         8185139   generic-all
 java/lang/StackWalker/CallerSensitiveMethod/Main.java                   8185139   generic-all
@@ -68,6 +70,7 @@
 java/lang/ref/OOMEInReferenceHandler.java                               8196611   generic-all
 java/lang/Runtime/exec/LotsOfOutput.java                                8196611   generic-all
 java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java   8196611   generic-all
+vm/gc/InfiniteList.java                                                 8196611   generic-all
 
 # tests require pop_frame and force_early_return capabilities
 com/sun/jdi/RedefineTTYLineNumber.java                                  8195635   generic-all