infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-06 08:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: almatvee, herrick
This commit is contained in:
Alexey Semenyuk 2020-11-19 17:24:32 +00:00
parent 9bb82232fa
commit 1718abaefa
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java
View File

@ -218,7 +218,7 @@ final public class Executor {
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();
}

14
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
View File

@ -43,6 +43,7 @@ import java.util.function.Consumer;
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 final class JPackageCommand extends CommandArguments<JPackageCommand> {
}).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;

4
test/jdk/tools/jpackage/windows/WinResourceTest.java
View File

@ -26,6 +26,7 @@ import java.nio.file.Path;
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 class WinResourceTest {
// 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());
})

6
test/jdk/tools/jpackage/windows/WinScriptTest.java
View File

@ -124,18 +124,18 @@ public class WinScriptTest {
}
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());