mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 00:36:16 +02:00
Code Issues Wiki Activity

Replace hard-coded versions with constants

Browse source 
Change-Id: I8653157bd1d351eb07f58b4b404edfdaaa0e756e
This commit is contained in:
Marc Khouzam 2016-03-20 20:20:34 -04:00 • committed by Gerrit Code Review @ Eclipse.org
parent ddf2dea0aa
commit f9d3a184aa
13 changed files with 57 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java
View file

@ -82,7 +82,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
@Override @Override
public void doBeforeTest() throws Exception { public void doBeforeTest() throws Exception {
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
super.doBeforeTest(); super.doBeforeTest();
fSession = getGDBLaunch().getSession(); fSession = getGDBLaunch().getSession();

5
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java
View file

@ -11,7 +11,8 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.tests.dsf.gdb.tests; package org.eclipse.cdt.tests.dsf.gdb.tests;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -121,7 +122,7 @@ public class GDBProcessesTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void getThreadData() throws Throwable { public void getThreadData() throws Throwable {
assumeGdbVersionAtLeast("7.3"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_3);
// Start the threads one by one to make sure they are discovered by gdb in the right // Start the threads one by one to make sure they are discovered by gdb in the right
// order. // order.
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {

4
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java
View file

@ -1134,7 +1134,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
protected boolean acceptsFastTpOnFourBytes() { protected boolean acceptsFastTpOnFourBytes() {
String gdbVersion = getGdbVersion(); String gdbVersion = getGdbVersion();
boolean isLower = LaunchUtils.compareVersions("7.4", gdbVersion) > 0; boolean isLower = LaunchUtils.compareVersions(ITestConstants.SUFFIX_GDB_7_4, gdbVersion) > 0;
if (isLower) return false; if (isLower) return false;
// With GDB 7.4, fast tracepoints only need an // With GDB 7.4, fast tracepoints only need an
// instruction of 4 bytes or more when on a 32bit architecture, instead of 5. // instruction of 4 bytes or more when on a 32bit architecture, instead of 5.
@ -1149,7 +1149,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void tracepointActionsWithCollectStrings() throws Throwable { public void tracepointActionsWithCollectStrings() throws Throwable {
assumeGdbVersionAtLeast("7.4"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_4);
TracepointActionManager tracepointActionMgr = TracepointActionManager.getInstance(); TracepointActionManager tracepointActionMgr = TracepointActionManager.getInstance();
CollectAction action1 = new CollectAction(); CollectAction action1 = new CollectAction();

28
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java
View file

@ -12,10 +12,12 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.tests.dsf.gdb.tests; package org.eclipse.cdt.tests.dsf.gdb.tests;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.*; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
@ -228,7 +230,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
@Test @Test
public void testSourceGdbInit() throws Throwable { public void testSourceGdbInit() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
setLaunchAttribute(IGDBLaunchConfigurationConstants.ATTR_GDB_INIT, setLaunchAttribute(IGDBLaunchConfigurationConstants.ATTR_GDB_INIT,
"data/launch/src/launchConfigTestGdbinit"); "data/launch/src/launchConfigTestGdbinit");
doLaunch(); doLaunch();
@ -287,7 +289,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
*/ */
@Test @Test
public void testSourceGdbInitRestart() throws Throwable { public void testSourceGdbInitRestart() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
fRestart = true; fRestart = true;
testSourceGdbInit(); testSourceGdbInit();
} }
@ -755,7 +757,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
*/ */
@Test @Test
public void testExitCodeSet() throws Throwable { public void testExitCodeSet() throws Throwable {
assumeGdbVersionAtLeast("7.3"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_3);
doLaunch(); doLaunch();
ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>(
@ -808,7 +810,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
*/ */
@Test @Test
public void testPendingBreakpointSetting() throws Throwable { public void testPendingBreakpointSetting() throws Throwable {
assumeGdbVersionAtLeast("7.0"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_0);
doLaunch(); doLaunch();
MIStoppedEvent stoppedEvent = getInitialStoppedEvent(); MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
@ -863,7 +865,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
*/ */
@Test @Test
public void testStopAtMainWithReverse() throws Throwable { public void testStopAtMainWithReverse() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true); setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true);
setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, "main"); setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, "main");
setLaunchAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE, true); setLaunchAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE, true);
@ -928,7 +930,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
*/ */
@Test @Test
public void testStopAtMainWithReverseRestart() throws Throwable { public void testStopAtMainWithReverseRestart() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
fRestart = true; fRestart = true;
testStopAtMainWithReverse(); testStopAtMainWithReverse();
} }
@ -945,7 +947,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
*/ */
@Test @Test
public void testStopAtOtherWithReverse() throws Throwable { public void testStopAtOtherWithReverse() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true); setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true);
setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, "stopAtOther"); setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, "stopAtOther");
setLaunchAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE, true); setLaunchAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE, true);
@ -1005,7 +1007,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
@Test @Test
@Ignore("Fails. Investigate what it needs to wait for.") @Ignore("Fails. Investigate what it needs to wait for.")
public void testStopAtOtherWithReverseRestart() throws Throwable { public void testStopAtOtherWithReverseRestart() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
fRestart = true; fRestart = true;
testStopAtOtherWithReverse(); testStopAtOtherWithReverse();
} }
@ -1019,7 +1021,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
@Test @Test
@Ignore("TODO: this is not working because it does not insert the breakpoint propertly") @Ignore("TODO: this is not working because it does not insert the breakpoint propertly")
public void testNoStopAtMainWithReverse() throws Throwable { public void testNoStopAtMainWithReverse() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false); setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
// Set this one as well to make sure it gets ignored // Set this one as well to make sure it gets ignored
setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, "main"); setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, "main");
@ -1089,7 +1091,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
@Test @Test
@Ignore @Ignore
public void testNoStopAtMainWithReverseRestart() throws Throwable { public void testNoStopAtMainWithReverseRestart() throws Throwable {
assumeGdbVersionAtLeast("7.2"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_2);
fRestart = true; fRestart = true;
testNoStopAtMainWithReverse(); testNoStopAtMainWithReverse();
} }

16
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java
View file

@ -311,7 +311,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testChildren() throws Throwable { public void testChildren() throws Throwable {
assumeGdbVersionAtLeast("6.7"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_7);
// Get the children of some variables // Get the children of some variables
MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testChildren"); MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testChildren");
@ -1829,8 +1829,8 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testDeleteChildren() throws Throwable { public void testDeleteChildren() throws Throwable {
assumeGdbVersionAtLeast("6.7"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_7);
assumeGdbVersionLowerThen("7.3"); assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_7_3);
SyncUtil.runToLocation("testDeleteChildren"); SyncUtil.runToLocation("testDeleteChildren");
MIStoppedEvent stoppedEvent = SyncUtil.step(1, StepType.STEP_OVER); MIStoppedEvent stoppedEvent = SyncUtil.step(1, StepType.STEP_OVER);
@ -2886,7 +2886,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testCanWriteLValue() throws Throwable { public void testCanWriteLValue() throws Throwable {
assumeGdbVersionAtLeast("6.8"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_8);
MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testCanWrite"); // Re-use test MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testCanWrite"); // Re-use test
final IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); final IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
@ -3463,8 +3463,8 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testRTTI() throws Throwable { public void testRTTI() throws Throwable {
assumeGdbVersionNot("6.7"); // crashing assumeGdbVersionNot(ITestConstants.SUFFIX_GDB_6_7); // crashing
assumeGdbVersionLowerThen("7.5"); assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_7_5);
SyncUtil.runToLocation("testRTTI"); SyncUtil.runToLocation("testRTTI");
MIStoppedEvent stoppedEvent = SyncUtil.step(3, StepType.STEP_OVER); MIStoppedEvent stoppedEvent = SyncUtil.step(3, StepType.STEP_OVER);
IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
@ -4267,7 +4267,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
// Bug 320277 // Bug 320277
@Test @Test
public void testDeleteChildren_7_3() throws Throwable { public void testDeleteChildren_7_3() throws Throwable {
assumeGdbVersionAtLeast("7.3"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_3);
SyncUtil.runToLocation("testDeleteChildren"); SyncUtil.runToLocation("testDeleteChildren");
MIStoppedEvent stoppedEvent = SyncUtil.step(1, StepType.STEP_OVER); MIStoppedEvent stoppedEvent = SyncUtil.step(1, StepType.STEP_OVER);
final IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); final IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
@ -4410,7 +4410,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testRTTI_7_5() throws Throwable { public void testRTTI_7_5() throws Throwable {
assumeGdbVersionAtLeast("7.5"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_5);
SyncUtil.runToLocation("testRTTI"); SyncUtil.runToLocation("testRTTI");
MIStoppedEvent stoppedEvent = SyncUtil.step(3, StepType.STEP_OVER); MIStoppedEvent stoppedEvent = SyncUtil.step(3, StepType.STEP_OVER);
IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);

24
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java
View file

@ -145,7 +145,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
protected void setExeNames() { protected void setExeNames() {
String gdbVersion = getGdbVersion(); String gdbVersion = getGdbVersion();
// has to be strictly lower // has to be strictly lower
boolean isLower = LaunchUtils.compareVersions("7.5", gdbVersion) > 0; boolean isLower = LaunchUtils.compareVersions(ITestConstants.SUFFIX_GDB_7_5, gdbVersion) > 0;
if (isLower) { if (isLower) {
EXEC_AC_NAME = "SourceLookupDwarf2AC.exe"; //$NON-NLS-1$ EXEC_AC_NAME = "SourceLookupDwarf2AC.exe"; //$NON-NLS-1$
EXEC_AN_NAME = "SourceLookupDwarf2AN.exe"; //$NON-NLS-1$ EXEC_AN_NAME = "SourceLookupDwarf2AN.exe"; //$NON-NLS-1$
@ -465,7 +465,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void sourceMappingAC() throws Throwable { public void sourceMappingAC() throws Throwable {
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMapping(EXEC_AC_NAME, false); sourceMapping(EXEC_AC_NAME, false);
} }
@ -484,7 +484,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void sourceMappingAN() throws Throwable { public void sourceMappingAN() throws Throwable {
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMapping(EXEC_AN_NAME, false); sourceMapping(EXEC_AN_NAME, false);
} }
@ -499,7 +499,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
* build path when the build path is an absolute path. GDB 6.8 and above * build path when the build path is an absolute path. GDB 6.8 and above
* works fine in this case. * works fine in this case.
*/ */
assumeGdbVersionAtLeast("6.8"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_8);
sourceMapping(EXEC_AN_NAME, true); sourceMapping(EXEC_AN_NAME, true);
} }
@ -509,7 +509,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void sourceMappingRC() throws Throwable { public void sourceMappingRC() throws Throwable {
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMapping(EXEC_RC_NAME, false); sourceMapping(EXEC_RC_NAME, false);
} }
@ -528,7 +528,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void sourceMappingRN() throws Throwable { public void sourceMappingRN() throws Throwable {
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMapping(EXEC_RN_NAME, false); sourceMapping(EXEC_RN_NAME, false);
} }
@ -543,7 +543,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
* build path when the build path is a relative path. GDB 7.6 and above * build path when the build path is a relative path. GDB 7.6 and above
* works fine in this case. * works fine in this case.
*/ */
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMapping(EXEC_RN_NAME, true); sourceMapping(EXEC_RN_NAME, true);
} }
@ -553,7 +553,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void sourceMappingBreakpointsAC() throws Throwable { public void sourceMappingBreakpointsAC() throws Throwable {
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMappingBreakpoints(EXEC_AC_NAME, false); sourceMappingBreakpoints(EXEC_AC_NAME, false);
} }
@ -587,7 +587,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
* build path when the build path is an absolute path. GDB 6.8 and above * build path when the build path is an absolute path. GDB 6.8 and above
* works fine in this case. * works fine in this case.
*/ */
assumeGdbVersionAtLeast("6.8"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_8);
sourceMappingBreakpoints(EXEC_AN_NAME, true); sourceMappingBreakpoints(EXEC_AN_NAME, true);
} }
@ -597,7 +597,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void sourceMappingBreakpointsRC() throws Throwable { public void sourceMappingBreakpointsRC() throws Throwable {
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMappingBreakpoints(EXEC_RC_NAME, false); sourceMappingBreakpoints(EXEC_RC_NAME, false);
} }
@ -631,7 +631,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
* build path when the build path is a relative path. GDB 7.6 and above * build path when the build path is a relative path. GDB 7.6 and above
* works fine in this case. * works fine in this case.
*/ */
assumeGdbVersionAtLeast("7.6"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_6);
sourceMappingBreakpoints(EXEC_RN_NAME, true); sourceMappingBreakpoints(EXEC_RN_NAME, true);
} }
@ -765,7 +765,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void directorySource() throws Throwable { public void directorySource() throws Throwable {
assumeGdbVersionLowerThen("7.6"); assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_7_6);
DirectorySourceContainer container = new DirectorySourceContainer(new Path(SOURCE_ABSPATH), false); DirectorySourceContainer container = new DirectorySourceContainer(new Path(SOURCE_ABSPATH), false);
setSourceContainer(container); setSourceContainer(container);
doLaunch(EXEC_PATH + EXEC_RC_NAME); doLaunch(EXEC_PATH + EXEC_RC_NAME);

4
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java
View file

@ -457,7 +457,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void atDoubleMethodStopAtBreakpointFunctionEntry() throws Throwable { public void atDoubleMethodStopAtBreakpointFunctionEntry() throws Throwable {
assumeGdbVersionAtLeast("7.4"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_4);
atDoubleMethodStopAtBreakpointCommon(FOO_LINE); atDoubleMethodStopAtBreakpointCommon(FOO_LINE);
} }
@ -497,7 +497,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void atDoubleMethodSkipBreakpointFunctionEntry() throws Throwable { public void atDoubleMethodSkipBreakpointFunctionEntry() throws Throwable {
assumeGdbVersionAtLeast("7.4"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_4);
atDoubleMethodSkipBreakpointCommon(FOO_LINE); atDoubleMethodSkipBreakpointCommon(FOO_LINE);
} }

2
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java
View file

@ -85,7 +85,7 @@ public class TraceFileTest extends BaseParametrizedTestCase {
@Override @Override
public void doBeforeTest() throws Exception { public void doBeforeTest() throws Exception {
assumeGdbVersionAtLeast("7.4"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_4);
removeTeminatedLaunchesBeforeTest(); removeTeminatedLaunchesBeforeTest();
// Suppress settings of the launch attributes and launching. // Suppress settings of the launch attributes and launching.
// Each test sets its own launch attributes // Each test sets its own launch attributes

7
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java
View file

@ -11,7 +11,9 @@
package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop; package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop;
import static org.junit.Assert.*; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -36,6 +38,7 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.IntermittentRule;
import org.eclipse.cdt.tests.dsf.gdb.framework.ServiceEventWaitor; import org.eclipse.cdt.tests.dsf.gdb.framework.ServiceEventWaitor;
import org.eclipse.cdt.tests.dsf.gdb.framework.SyncUtil; import org.eclipse.cdt.tests.dsf.gdb.framework.SyncUtil;
import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin; import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin;
import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;
import org.junit.Assume; import org.junit.Assume;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule; import org.junit.Rule;
@ -68,7 +71,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
@Override @Override
public void doBeforeTest() throws Exception { public void doBeforeTest() throws Exception {
assumeGdbVersionAtLeast("7.0"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_0);
super.doBeforeTest(); super.doBeforeTest();
final DsfSession session = getGDBLaunch().getSession(); final DsfSession session = getGDBLaunch().getSession();

3
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/MIExpressionsNonStopTest.java
View file

@ -11,6 +11,7 @@
package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop; package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop;
import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.MIExpressionsTest; import org.eclipse.cdt.tests.dsf.gdb.tests.MIExpressionsTest;
import org.junit.Assume; import org.junit.Assume;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -27,7 +28,7 @@ public class MIExpressionsNonStopTest extends MIExpressionsTest {
@Override @Override
public void doBeforeTest() throws Exception { public void doBeforeTest() throws Exception {
assumeGdbVersionAtLeast("7.0"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_0);
super.doBeforeTest(); super.doBeforeTest();
} }

3
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/MIRunControlNonStopTargetAvailableTest.java
View file

@ -11,6 +11,7 @@
package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop; package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop;
import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.MIRunControlTargetAvailableTest; import org.eclipse.cdt.tests.dsf.gdb.tests.MIRunControlTargetAvailableTest;
import org.junit.Assume; import org.junit.Assume;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -27,7 +28,7 @@ public class MIRunControlNonStopTargetAvailableTest extends MIRunControlTargetAv
@Override @Override
public void doBeforeTest() throws Exception { public void doBeforeTest() throws Exception {
assumeGdbVersionAtLeast("7.0"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_0);
super.doBeforeTest(); super.doBeforeTest();
} }

3
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/OperationsWhileTargetIsRunningNonStopTest.java
View file

@ -11,6 +11,7 @@
package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop; package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop;
import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.OperationsWhileTargetIsRunningTest; import org.eclipse.cdt.tests.dsf.gdb.tests.OperationsWhileTargetIsRunningTest;
import org.junit.Assume; import org.junit.Assume;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -33,7 +34,7 @@ public class OperationsWhileTargetIsRunningNonStopTest extends OperationsWhileTa
@Override @Override
public void doBeforeTest() throws Exception { public void doBeforeTest() throws Exception {
assumeGdbVersionAtLeast("7.0"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_0);
super.doBeforeTest(); super.doBeforeTest();
} }

3
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/StepIntoSelectionNonStopTest.java
View file

@ -11,6 +11,7 @@
package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop; package org.eclipse.cdt.tests.dsf.gdb.tests.nonstop;
import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;
import org.eclipse.cdt.tests.dsf.gdb.tests.StepIntoSelectionTest; import org.eclipse.cdt.tests.dsf.gdb.tests.StepIntoSelectionTest;
import org.junit.Assume; import org.junit.Assume;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -33,7 +34,7 @@ public class StepIntoSelectionNonStopTest extends StepIntoSelectionTest {
@Override @Override
public void doBeforeTest() throws Exception { public void doBeforeTest() throws Exception {
assumeGdbVersionAtLeast("7.0"); assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_0);
super.doBeforeTest(); super.doBeforeTest();
} }