Skip to content

8353681: jpackage suppresses errors when executed with --verbose option #24428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexeysemenyukoracle wants to merge 2 commits into from
Closed

8353681: jpackage suppresses errors when executed with --verbose option #24428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b52db5b
Add test.
alexeysemenyukoracle Apr 3, 2025
5488b68
Print all errors when jpackage is executed with verbose output. Prior…
alexeysemenyukoracle Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,16 +551,13 @@ public boolean processArguments() {
generateBundle(bp.getBundleParamsAsMap());
return true;
} catch (Exception e) {
if (Log.isVerbose()) {
Log.verbose(e);
} else {
String msg1 = e.getMessage();
Log.fatalError(msg1);
if (e.getCause() != null && e.getCause() != e) {
String msg2 = e.getCause().getMessage();
if (msg2 != null && !msg1.contains(msg2)) {
Log.fatalError(msg2);
}
Log.verbose(e);
String msg1 = e.getMessage();
Log.fatalError(msg1);
if (e.getCause() != null && e.getCause() != e) {
String msg2 = e.getCause().getMessage();
if (msg2 != null && !msg1.contains(msg2)) {
Log.fatalError(msg2);
}
}
return false;
Expand Down
27 changes: 17 additions & 10 deletions test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
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;
Expand Down Expand Up @@ -1174,16 +1173,20 @@ public static String escapeAndJoin(List<String> args) {
}

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 stream.map(JPackageCommand::stripTimestamp);
}

public static String stripTimestamp(String str) {
final var m = TIMESTAMP_REGEXP.matcher(str);
if (m.find()) {
return str.substring(m.end());
} else {
return str;
});
}
}

public static boolean withTimestamp(String str) {
return TIMESTAMP_REGEXP.matcher(str).find();
}

@Override
Expand Down Expand Up @@ -1279,4 +1282,8 @@ public void run() {
}).get();

private static final String UNPACKED_PATH_ARGNAME = "jpt-unpacked-folder";

// [HH:mm:ss.SSS]
private static final Pattern TIMESTAMP_REGEXP = Pattern.compile(
"^\\[\\d\\d:\\d\\d:\\d\\d.\\d\\d\\d\\] ");
}
45 changes: 35 additions & 10 deletions test/jdk/tools/jpackage/share/BasicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,34 @@
*/


import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE_AND_UNPACK;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import jdk.jpackage.test.TKit;
import jdk.jpackage.internal.util.function.ThrowingConsumer;
import jdk.jpackage.test.Annotations.Parameter;
import jdk.jpackage.test.Annotations.ParameterSupplier;
import jdk.jpackage.test.Annotations.Test;
import jdk.jpackage.test.CannedFormattedString;
import jdk.jpackage.test.Executor;
import jdk.jpackage.test.HelloApp;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.JPackageStringBundle;
import jdk.jpackage.test.JavaAppDesc;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.HelloApp;
import jdk.jpackage.test.Executor;
import jdk.jpackage.test.JavaTool;
import jdk.jpackage.test.Annotations.Test;
import jdk.jpackage.test.Annotations.Parameter;
import jdk.jpackage.test.Annotations.ParameterSupplier;
import jdk.jpackage.internal.util.function.ThrowingConsumer;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.TKit;
import jdk.tools.jlink.internal.LinkableRuntimeImage;
import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE_AND_UNPACK;

/*
* @test
Expand Down Expand Up @@ -228,6 +230,29 @@ public void testVerbose() {
});
}

@Test
@Parameter("false")
@Parameter("true")
public void testErrorsAlwaysPrinted(boolean verbose) {
final var cmd = JPackageCommand.helloAppImage()
.ignoreDefaultVerbose(true)
.useToolProvider(false)
.removeArgumentWithValue("--main-class");

if (verbose) {
cmd.addArgument("--verbose");
}

final var textVerifier = Stream.of(
List.of("error.no-main-class-with-main-jar", "hello.jar"),
List.of("error.no-main-class-with-main-jar.advice", "hello.jar")
).map(args -> {
return JPackageStringBundle.MAIN.cannedFormattedString(args.getFirst(), args.subList(1, args.size()).toArray());
}).map(CannedFormattedString::getValue).map(TKit::assertTextStream).reduce(TKit.TextStreamVerifier::andThen).orElseThrow();

textVerifier.apply(cmd.saveConsoleOutput(true).execute(1).getOutput().stream().filter(Predicate.not(JPackageCommand::withTimestamp)));
}

@Test
public void testNoName() {
final String mainClassName = "Greetings";
Expand Down