diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java index 241ef73a6d2..4bf45f6ac2a 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java @@ -413,9 +413,17 @@ public class BaseTestCase { if (GdbDebugOptions.DEBUG) { GdbDebugOptions.trace("===============================================================================================\n"); - GdbDebugOptions.trace(String.format("%s \"%s\" launching %s %s\n", - GdbPlugin.getDebugTime(), testName.getMethodName(), launchAttributes.get(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME), remote ? "with gdbserver" : "")); - GdbDebugOptions.trace("===============================================================================================\n"); + } + + // Always print this output to help easily troubleshoot tests on Hudson + // Don't end with a new line as we may add another printout in doInnerLaunch() + // Also don't split the line to make it all nicely aligned + GdbDebugOptions.trace(String.format("%s \"%s\" requesting %s%s", + GdbPlugin.getDebugTime(), testName.getMethodName(), launchAttributes.get(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME), remote ? " with gdbserver." : ".") + , -1); + + if (GdbDebugOptions.DEBUG) { + GdbDebugOptions.trace("\n===============================================================================================\n"); } launchGdbServer(); @@ -476,6 +484,12 @@ public class BaseTestCase { // problem launching and no session is created). DsfSession.addSessionStartedListener(sessionStartedListener); GdbLaunch launch = (GdbLaunch)fLaunchConfiguration.launch(ILaunchManager.DEBUG_MODE, new NullProgressMonitor()); + if (!GdbDebugOptions.DEBUG) { + // Now that we have started the launch we can print the real GDB version + // but not if DEBUG is on since we get the version anyway in that case. + GdbDebugOptions.trace(String.format(" Launched gdb %s.\n", launch.getGDBVersion())); + } + DsfSession.removeSessionStartedListener(sessionStartedListener); try {