From ff6df15be3dc94b773093d86e42e0dd1da24d5a2 Mon Sep 17 00:00:00 2001 From: Andy Herrick Date: Tue, 24 Nov 2020 14:59:13 +0000 Subject: [PATCH] 8256801: tools/jpackage/share/FileAssociationsTest.java#id0 failed unpack.bat with "Exit code: 1603" Reviewed-by: asemenyuk, almatvee, kizune --- .../jpackage/helpers/jdk/jpackage/test/WindowsHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java index 3c49daecb43..458fd0d7d45 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java @@ -65,7 +65,11 @@ public class WindowsHelper { Executor.Result result = null; for (int attempt = 0; attempt != 3; ++attempt) { result = misexec.executeWithoutExitCodeCheck(); - if (result.exitCode == 1618) { + + // The given Executor may either be of an msiexe command or an + // unpack.bat script containing the msiexec command. In the later + // case, when misexec returns 1618, the unpack.bat may return 1603 + if ((result.exitCode == 1618) || (result.exitCode == 1603)) { // Another installation is already in progress. // Wait a little and try again. ThrowingRunnable.toRunnable(() -> Thread.sleep(3000)).run();