8247353: jtreg tests minor issues clean up

Reviewed-by: herrick, almatvee
openjdk · Jun 11, 2020 · 259662fe77a8a3c4a90f3489046dc84696c88c29 · 259662f
1 parent a240133
commit 259662fe77a8a3c4a90f3489046dc84696c88c29
Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/test/jdk/tools/jpackage/share/AddLauncherTest.java b/test/jdk/tools/jpackage/share/AddLauncherTest.java
@@ -177,6 +177,7 @@ public void testMainLauncherIsModular(boolean mainLauncherIsModular) {
             cmd.addArguments("--module-path", modularJarCmd.getArgumentValue(
                     "--module-path"));
             cmd.addArguments("--add-modules", modularAppDesc.moduleName());
+            cmd.ignoreDefaultRuntime(true); // because of --add-modules
         }
 
         new AdditionalLauncher("ModularAppLauncher")

diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java
@@ -227,7 +227,8 @@ public void testWhitespaceInPaths() {
     @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 @@ public void testTemp() throws IOException {
         .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)