--- 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