Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ant/org.eclipse.ant.tests.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ant.tests.ui; singleton:=true
Bundle-Version: 3.12.400.qualifier
Bundle-Version: 3.12.500.qualifier
Bundle-ClassPath: anttestsui.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.internal.ui.views.console.ProcessConsole;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.text.BadLocationException;
Expand All @@ -45,6 +48,9 @@
import org.eclipse.jface.text.Position;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.console.ConsolePlugin;
import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IConsoleManager;
import org.eclipse.ui.console.IHyperlink;
import org.eclipse.ui.internal.console.ConsoleHyperlinkPosition;
import org.eclipse.ui.internal.console.IOConsolePartition;
Expand Down Expand Up @@ -85,6 +91,7 @@ public static Object launchAndWait(ILaunchConfiguration configuration, DebugEven
ILaunch launch = configuration.launch(ILaunchManager.RUN_MODE, null);
Object suspendee = waiter.waitForEvent();
if (suspendee == null) {
logProcessConsoleContents();
try {
launch.terminate();
}
Expand Down Expand Up @@ -334,4 +341,23 @@ public static IHyperlink getHyperlink(int offset, IDocument doc) {
public static void activateLink(final IHyperlink link) {
Display.getDefault().asyncExec(() -> link.linkActivated());
}

public static void logProcessConsoleContents() {
try {
StringBuilder buf = new StringBuilder();
IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
for (IConsole console : manager.getConsoles()) {
if (console instanceof ProcessConsole) {
ProcessConsole processConsole = (ProcessConsole) console;
String string = processConsole.getDocument().get();
buf.append("Console output for \"" + processConsole.getName() + "\" follows:\n"); //$NON-NLS-1$ //$NON-NLS-2$
buf.append(string);
}
}
buf.append("\n"); //$NON-NLS-1$
AntUIPlugin.log(new Status(IStatus.INFO, "org.eclipse.jdt.debug.ui.tests", buf.toString())); //$NON-NLS-1$
} catch (Throwable t) {
AntUIPlugin.log(t);
}
}
}
Loading