8227400: Adjust jib profiles to make 3rd party tools for creating installers available on Mach5 test machines

Reviewed-by: almatvee, herrick

Author: Alexey Semenyuk

src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java

@@ -218,7 +218,7 @@ private static String createLogMessage(ProcessBuilder pb, boolean quiet) {
         StringBuilder sb = new StringBuilder();
         sb.append((quiet) ? pb.command().get(0) : pb.command());
         if (pb.directory() != null) {
-            sb.append(String.format("in %s", pb.directory().getAbsolutePath()));
+            sb.append(String.format(" in %s", pb.directory().getAbsolutePath()));
         }
         return sb.toString();
     }

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

@@ -43,6 +43,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -835,6 +836,19 @@ public static String escapeAndJoin(List<String> args) {
         }).collect(Collectors.joining(" "));
     }
 
+    public static Stream<String> stripTimestamps(Stream<String> stream) {
+        // [HH:mm:ss.SSS]
+        final Pattern timestampRegexp = Pattern.compile(
+                "^\\[\\d\\d:\\d\\d:\\d\\d.\\d\\d\\d\\] ");
+        return stream.map(str -> {
+            Matcher m = timestampRegexp.matcher(str);
+            if (m.find()) {
+                str = str.substring(m.end());
+            }
+            return str;
+        });
+    }
+
     @Override
     protected boolean isMutable() {
         return !immutable;

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

@@ -26,6 +26,7 @@
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.Annotations.Parameters;
 import java.util.List;
@@ -85,7 +86,8 @@ public void test() throws IOException {
             // examining its output
             TKit.assertTextStream(expectedLogMessage)
                     .predicate(String::startsWith)
-                    .apply(result.getOutput().stream());
+                    .apply(JPackageCommand.stripTimestamps(
+                            result.getOutput().stream()));
             TKit.assertTextStream("error CNDL0104 : Not a valid source file")
                     .apply(result.getOutput().stream());
         })

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

@@ -124,18 +124,18 @@ private static class ScriptData {
         }
 
         void assertJPackageOutput(List<String> output) {
-            TKit.assertTextStream(String.format("jp: %s", echoText))
+            TKit.assertTextStream(String.format("    jp: %s", echoText))
                     .predicate(String::equals)
                     .apply(output.stream());
 
-            String cwdPattern = String.format("jp: CWD(%s)=", envVarName);
+            String cwdPattern = String.format("    jp: CWD(%s)=", envVarName);
             TKit.assertTextStream(cwdPattern)
                     .predicate(String::startsWith)
                     .apply(output.stream());
             String cwd = output.stream().filter(line -> line.startsWith(
                     cwdPattern)).findFirst().get().substring(cwdPattern.length());
 
-            String envVarPattern = String.format("jp: %s=", envVarName);
+            String envVarPattern = String.format("    jp: %s=", envVarName);
             TKit.assertTextStream(envVarPattern)
                     .predicate(String::startsWith)
                     .apply(output.stream());