test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java

@@ -19,10 +19,11 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
+import jdk.jpackage.test.Test;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 
 /**
  * Test both --win-upgrade-uuid and --app-version parameters. Output of the test

@@ -39,26 +40,28 @@
  * @test
  * @summary jpackage with --win-upgrade-uuid and --app-version
  * @library ../helpers
  * @requires (os.family == "windows")
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m WinUpgradeUUIDTest
+ * @run main/othervm/timeout=360 -Xmx512m WinUpgradeUUIDTest
  */
 
 public class WinUpgradeUUIDTest {
     public static void main(String[] args) {
+        Test.run(args, () -> {
         PackageTest test = init();
-        if (test.getAction() != PackageTest.Action.VERIFY_INSTALLED) {
+            if (test.getAction() != PackageTest.Action.VERIFY_INSTALL) {
             test.run();
         }
 
         test = init();
         test.addInitializer(cmd -> {
             cmd.setArgumentValue("--app-version", "2.0");
             cmd.setArgumentValue("--arguments", "bar");
         });
         test.run();
+        });
     }
 
     private static PackageTest init() {
         return new PackageTest()
         .forTypes(PackageType.WINDOWS)