OpenJDK / jdk / jdk
changeset 59728:36a2f799b7fb
8247353: jtreg tests minor issues clean up
Reviewed-by: herrick, almatvee
| author | asemenyuk |
|---|---|
| date | Wed, 10 Jun 2020 20:45:28 -0400 |
| parents | 9c238ccfdb27 |
| children | 7287fff412d4 |
| files | test/jdk/tools/jpackage/share/AddLauncherTest.java test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/test/jdk/tools/jpackage/share/AddLauncherTest.java Wed Jun 10 20:45:28 2020 -0400 +++ b/test/jdk/tools/jpackage/share/AddLauncherTest.java Wed Jun 10 20:45:28 2020 -0400 @@ -177,6 +177,7 @@ cmd.addArguments("--module-path", modularJarCmd.getArgumentValue( "--module-path")); cmd.addArguments("--add-modules", modularAppDesc.moduleName()); + cmd.ignoreDefaultRuntime(true); // because of --add-modules } new AdditionalLauncher("ModularAppLauncher")
--- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java Wed Jun 10 20:45:28 2020 -0400 +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java Wed Jun 10 20:45:28 2020 -0400 @@ -227,7 +227,8 @@ @Parameter({ "java.desktop", "jdk.jartool" }) public void testAddModules(String... addModulesArg) { JPackageCommand cmd = JPackageCommand - .helloAppImage("goodbye.jar:com.other/com.other.Hello"); + .helloAppImage("goodbye.jar:com.other/com.other.Hello") + .ignoreDefaultRuntime(true); // because of --add-modules Stream.of(addModulesArg).map(v -> Stream.of("--add-modules", v)).flatMap( s -> s).forEachOrdered(cmd::addArgument); cmd.executeAndAssertHelloAppImageCreated(); @@ -270,10 +271,6 @@ .run(PackageTest.Action.CREATE); createTest.get() - .addInitializer(cmd -> { - // Clean output from the previus jpackage run. - Files.delete(cmd.outputBundle()); - }) // Temporary directory should not be empty, // jpackage should exit with error. .setExpectedExitCode(1)