backport 227c430b55e7f9a4257b9249881c8ec75574895c

Author: GoeLin

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java

@@ -53,6 +53,7 @@ public static Executor of(String... cmdline) {
     public Executor() {
         saveOutputType = new HashSet<>(Set.of(SaveOutputType.NONE));
         removePath = false;
+        winEnglishOutput = false;
     }
 
     public Executor setExecutable(String v) {
@@ -89,6 +90,15 @@ public Executor setRemovePath(boolean value) {
         return this;
     }
 
+    public Executor setWinRunWithEnglishOutput(boolean value) {
+        if (!TKit.isWindows()) {
+            throw new UnsupportedOperationException(
+                    "setWinRunWithEnglishOutput is only valid on Windows platform");
+        }
+        winEnglishOutput = value;
+        return this;
+    }
+
     public Executor setWindowsTmpDir(String tmp) {
         if (!TKit.isWindows()) {
             throw new UnsupportedOperationException(
@@ -206,6 +216,11 @@ public Result executeWithoutExitCodeCheck() {
                     "Can't change directory when using tool provider");
         }
 
+        if (toolProvider != null && winEnglishOutput) {
+            throw new IllegalArgumentException(
+                    "Can't change locale when using tool provider");
+        }
+
         return ThrowingSupplier.toSupplier(() -> {
             if (toolProvider != null) {
                 return runToolProvider();
@@ -285,8 +300,17 @@ private Path executablePath() {
         return executable.toAbsolutePath();
     }
 
+    private List<String> prefixCommandLineArgs() {
+        if (winEnglishOutput) {
+            return List.of("cmd.exe", "/c", "chcp", "437", ">nul", "2>&1", "&&");
+        } else {
+            return List.of();
+        }
+    }
+
     private Result runExecutable() throws IOException, InterruptedException {
         List<String> command = new ArrayList<>();
+        command.addAll(prefixCommandLineArgs());
         command.add(executablePath().toString());
         command.addAll(args);
         ProcessBuilder builder = new ProcessBuilder(command);
@@ -418,15 +442,17 @@ public String getPrintableCommandLine() {
             exec = executablePath().toString();
         }
 
-        return String.format(format, printCommandLine(exec, args),
-                args.size() + 1);
+        var cmdline = Stream.of(prefixCommandLineArgs(), List.of(exec), args).flatMap(
+                List::stream).toList();
+
+        return String.format(format, printCommandLine(cmdline), cmdline.size());
     }
 
-    private static String printCommandLine(String executable, List<String> args) {
+    private static String printCommandLine(List<String> cmdline) {
         // Want command line printed in a way it can be easily copy/pasted
-        // to be executed manally
+        // to be executed manually
         Pattern regex = Pattern.compile("\\s");
-        return Stream.concat(Stream.of(executable), args.stream()).map(
+        return cmdline.stream().map(
                 v -> (v.isEmpty() || regex.matcher(v).find()) ? "\"" + v + "\"" : v).collect(
                         Collectors.joining(" "));
     }
@@ -440,6 +466,7 @@ private static void trace(String msg) {
     private Set<SaveOutputType> saveOutputType;
     private Path directory;
     private boolean removePath;
+    private boolean winEnglishOutput;
     private String winTmpDir = null;
 
     private static enum SaveOutputType {

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

@@ -105,7 +105,7 @@ private static Optional<Long> findMainAppLauncherPID(JPackageCommand cmd,
                 + cmd.appLauncherPath().getFileName().toString()
                 + "'\\\" | select ProcessID,ParentProcessID";
         List<String> output = Executor.of("powershell", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command", command)
-                .dumpOutput(true).saveOutput().executeAndGetOutput();
+                .dumpOutput(true).saveOutput().setWinRunWithEnglishOutput(true).executeAndGetOutput();
 
         if (expectedCount == 0) {
             if (output.size() < 1) {