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

*** 19,28 ****
--- 19,29 ----
   * 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 --win-menu parameter. Output of the test should be WinMenuTest-1.0.exe
*** 35,50 ****
   * @test
   * @summary jpackage with --win-menu
   * @library ../helpers
   * @requires (os.family == "windows")
   * @modules jdk.jpackage/jdk.jpackage.internal
!  * @run main/othervm -Xmx512m WinMenuTest
   */
  
  public class WinMenuTest {
      public static void main(String[] args) {
          new PackageTest()
          .forTypes(PackageType.WINDOWS)
          .configureHelloApp()
          .addInitializer(cmd -> cmd.addArgument("--win-menu")).run();
      }
  }
--- 36,53 ----
   * @test
   * @summary jpackage with --win-menu
   * @library ../helpers
   * @requires (os.family == "windows")
   * @modules jdk.jpackage/jdk.jpackage.internal
!  * @run main/othervm/timeout=360 -Xmx512m WinMenuTest
   */
  
  public class WinMenuTest {
      public static void main(String[] args) {
+         Test.run(args, () -> {
              new PackageTest()
              .forTypes(PackageType.WINDOWS)
              .configureHelloApp()
              .addInitializer(cmd -> cmd.addArgument("--win-menu")).run();
+         });
      }
  }