test/jdk/tools/jpackage/linux/ReleaseTest.java

*** 19,30 ****
   * 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.PackageTest;
  import jdk.jpackage.test.PackageType;
  import jdk.jpackage.test.Test;
  
  
  /**
   * Test --linux-app-release parameter. Output of the test should be
--- 19,30 ----
   * 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.PackageType;
+ import jdk.jpackage.test.PackageTest;
  import jdk.jpackage.test.Test;
  
  
  /**
   * Test --linux-app-release parameter. Output of the test should be
*** 47,59 ****
   * @modules jdk.jpackage/jdk.jpackage.internal
   * @run main/othervm/timeout=360 -Xmx512m ReleaseTest
   */
  public class ReleaseTest {
  
!     public static void main(String[] args) throws Exception {
          final String RELEASE = "Rc3";
  
          new PackageTest()
          .forTypes(PackageType.LINUX)
          .configureHelloApp()
          .addInitializer(cmd -> {
              cmd.addArguments("--linux-app-release", RELEASE);
--- 47,60 ----
   * @modules jdk.jpackage/jdk.jpackage.internal
   * @run main/othervm/timeout=360 -Xmx512m ReleaseTest
   */
  public class ReleaseTest {
  
!     public static void main(String[] args) {
          final String RELEASE = "Rc3";
  
+         Test.run(args, () -> {
              new PackageTest()
              .forTypes(PackageType.LINUX)
              .configureHelloApp()
              .addInitializer(cmd -> {
                  cmd.addArguments("--linux-app-release", RELEASE);
*** 65,71 ****
--- 66,73 ----
                  Test.assertTrue(propValue.endsWith("-" + RELEASE),
                          String.format("Check value of %s property [%s] ends with %s",
                                  propName, propValue, RELEASE));
              })
              .run();
+         });
      }
  }