Skip to content

Make runner progress output configurable via system property #312

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

Merged
basilevs merged 4 commits into from
May 5, 2026
+19 −1
Merged

Make runner progress output configurable via system property #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc1ecae
Make runner progress output configurable via system property
rolandthoma May 4, 2026
d11a41b
Fixed setting name
rolandthoma May 4, 2026
0fd40b6
Fixed setting name and space
rolandthoma May 4, 2026
4f03ad2
Align runner progress property with Maven plugin and reviewer feedback
rolandthoma May 5, 2026
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
16 changes: 16 additions & 0 deletions maven-plugin/rcptt-maven-plugin/src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public class ExecuteMojo extends AbstractRCPTTMojo {
private static final String RUNNER_PLATFORM = "-runnerPlatform";
private static final String TESTENGINE = "-testEngine";
private static final String ENABLE_SOFTWARE_INSTALLATION = "-enableSoftwareInstallation";
private static final String RUNNER_PROGRESS_PROPERTY = "rcptt.runner.target_progress";

private static int shutdownListenerPort;
private static final String[] DEFAULT_Q7_VM_ARGS = new String[] { "-Xms256m", "-Xmx512m",
Expand Down Expand Up @@ -123,6 +124,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {

List<String> q7VmArgs = new ArrayList<String>();
String[] userArgs = getQ7Coords().getVmArgs();

if (userArgs == null || userArgs.length == 0) {
q7VmArgs.addAll(asList(DEFAULT_Q7_VM_ARGS));
if (java.hasPermGen()) {
Expand All @@ -132,6 +134,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
q7VmArgs.addAll(asList(userArgs));
}

if (!containsProperty(q7VmArgs, RUNNER_PROGRESS_PROPERTY)) {
q7VmArgs.add("-D" + RUNNER_PROGRESS_PROPERTY + "=" + getLog().isDebugEnabled());
}

for (String arg : q7VmArgs) {
cmd.createArg().setValue(arg);
}
Expand Down Expand Up @@ -328,6 +334,16 @@ public void run() {
}
};

private static boolean containsProperty(List<String> args, String property) {
String prefix = "-D" + property + "=";
for (String arg : args) {
if (arg.startsWith(prefix)) {
return true;
}
}
return false;
}

private String getImports() throws MojoFailureException {
StringBuilder sb = new StringBuilder();
for (File file : getProjectsDir().listFiles()) {
Expand Down
4 changes: 3 additions & 1 deletion runner/org.eclipse.rcptt.runner/src/org/eclipse/rcptt/runner/util/TargetPlatformChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ private void initializeTargetPlatform() throws CoreException {
targetPlatform = null;
compatibility = null;
String location = PDELocationUtils.getProductLocation(conf.location).getAbsolutePath();
PrintStreamMonitor outMonitor = new PrintStreamMonitor(true);
boolean progressEnabled = Boolean.parseBoolean(System.getProperty("rcptt.runner.target_progress", "true"));

PrintStreamMonitor outMonitor = new PrintStreamMonitor(progressEnabled);
if (conf.config != null) {
targetPlatform = TargetPlatformManager.createTargetPlatform(location, outMonitor);
Map<String, Version> versions = targetPlatform.getVersions();
Expand Down
Loading