mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 12:55:40 +02:00
Code Issues Wiki Activity

Previous commit caused test failures with gdb 6.8 due to a breakpoint hit not being generated when using SyncUtil to set the breakpoint. Avoid using SyncUti for setting a line breakpoint. Also some refactoring to reduce clutter and code duplication.

Browse source
This commit is contained in:
John Cortell 2010-06-03 18:43:26 +00:00
parent 0d30c8b779
commit aaf7b3dfbb
1 changed files with 45 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java
View file

@ -485,6 +485,42 @@ public class MIBreakpointsTest extends BaseTestCase {
return drm.getData(); return drm.getData();
} }
/**
* Utility method for setting a line breakpoint in the test's source file and
* then running to it.
*
* @param lineNumber the line to set the breakpoint on
* @return the breakpoint DM context
* @throws Throwable
*/
private IBreakpointDMContext insertAndRunToLineBreakpoint(int lineNumber) throws Throwable {
clearEventCounters();
// Create a line breakpoint
Map<String, Object> breakpoint = new HashMap<String, Object>();
breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG);
breakpoint.put(FILE_NAME_TAG, SOURCE_FILE);
breakpoint.put(LINE_NUMBER_TAG, lineNumber);
// Install the breakpoint
IBreakpointDMContext ref = insertBreakpoint(fBreakpointsDmc, breakpoint);
assertTrue(fWait.getMessage(), fWait.isOK());
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent(1);
assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
SyncUtil.resumeUntilStopped(2000);
waitForBreakpointEvent(1); // breakpoint hit
clearEventCounters();
return ref;
}
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
* insertBreakpoint * insertBreakpoint
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2046,16 +2082,8 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@Test @Test
public void updateWatchpoint_AddCondition() throws Throwable { public void updateWatchpoint_AddCondition() throws Throwable {
// Run to the point where the variable is initialized // Run to the point where the variable is initialized
String fileName = SOURCE_FILE; insertAndRunToLineBreakpoint(LINE_NUMBER_1);
if (fileName.contains(" ")) { //$NON-NLS-1$
fileName = "\"" + fileName + "\""; //$NON-NLS-1$//$NON-NLS-2$
}
SyncUtil.addBreakpoint(fileName + ":" + LINE_NUMBER_1, true);
SyncUtil.resumeUntilStopped(1000);
waitForBreakpointEvent(1); // bkpt-hit only; no bkpt-add event when using SyncUtil.addBreakpoint()
clearEventCounters();
// Create a write watchpoint // Create a write watchpoint
Map<String, Object> watchpoint = new HashMap<String, Object>(); Map<String, Object> watchpoint = new HashMap<String, Object>();
@ -2102,17 +2130,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@Test @Test
public void updateWatchpoint_RemoveCondition() throws Throwable { public void updateWatchpoint_RemoveCondition() throws Throwable {
// Run to the point where the variable is initialized // Run to the point where the variable is initialized
String fileName = SOURCE_FILE; insertAndRunToLineBreakpoint(LINE_NUMBER_1);
if (fileName.contains(" ")) { //$NON-NLS-1$
fileName = "\"" + fileName + "\""; //$NON-NLS-1$//$NON-NLS-2$
}
SyncUtil.addBreakpoint(fileName + ":" + LINE_NUMBER_1, true);
SyncUtil.resumeUntilStopped(1000);
waitForBreakpointEvent(1); // bkpt-hit only; no bkpt-add event when using SyncUtil.addBreakpoint()
clearEventCounters();
// Create a write watchpoint // Create a write watchpoint
Map<String, Object> watchpoint = new HashMap<String, Object>(); Map<String, Object> watchpoint = new HashMap<String, Object>();
watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG);
@ -2159,16 +2179,8 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@Test @Test
public void updateWatchpoint_ModifyCondition() throws Throwable { public void updateWatchpoint_ModifyCondition() throws Throwable {
// Run to the point where the variable is initialized // Run to the point where the variable is initialized
String fileName = SOURCE_FILE; insertAndRunToLineBreakpoint(LINE_NUMBER_1);
if (fileName.contains(" ")) { //$NON-NLS-1$
fileName = "\"" + fileName + "\""; //$NON-NLS-1$//$NON-NLS-2$
}
SyncUtil.addBreakpoint(fileName + ":" + LINE_NUMBER_1, true);
SyncUtil.resumeUntilStopped(1000);
waitForBreakpointEvent(1); // bkpt-hit only; no bkpt-add event when using SyncUtil.addBreakpoint()
clearEventCounters();
// Create a write watchpoint // Create a write watchpoint
Map<String, Object> watchpoint = new HashMap<String, Object>(); Map<String, Object> watchpoint = new HashMap<String, Object>();
@ -3187,17 +3199,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@Test @Test
public void breakpointHit_watchpointUpdateCount() throws Throwable { public void breakpointHit_watchpointUpdateCount() throws Throwable {
// Run to the point where the variable is initialized // Run to the point where the variable is initialized
String fileName = SOURCE_FILE; insertAndRunToLineBreakpoint(LINE_NUMBER_4);
if (fileName.contains(" ")) { //$NON-NLS-1$
fileName = "\"" + fileName + "\""; //$NON-NLS-1$//$NON-NLS-2$
}
SyncUtil.addBreakpoint(fileName + ":" + LINE_NUMBER_4, true);
SyncUtil.resumeUntilStopped(1000);
waitForBreakpointEvent(1); // bkpt-hit only; no bkpt-add event when using SyncUtil.addBreakpoint()
clearEventCounters();
// Create a write watchpoint // Create a write watchpoint
Map<String, Object> watchpoint = new HashMap<String, Object>(); Map<String, Object> watchpoint = new HashMap<String, Object>();
watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG);
@ -3258,17 +3262,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@Test @Test
public void breakpointHit_watchpointUpdateCondition() throws Throwable { public void breakpointHit_watchpointUpdateCondition() throws Throwable {
// Run to the point where the variable is initialized // Run to the point where the variable is initialized
String fileName = SOURCE_FILE; insertAndRunToLineBreakpoint(LINE_NUMBER_4);
if (fileName.contains(" ")) { //$NON-NLS-1$
fileName = "\"" + fileName + "\""; //$NON-NLS-1$//$NON-NLS-2$
}
SyncUtil.addBreakpoint(fileName + ":" + LINE_NUMBER_4, true);
SyncUtil.resumeUntilStopped();
waitForBreakpointEvent(1); // bkpt-hit only; no bkpt-add event when using SyncUtil.addBreakpoint()
clearEventCounters();
// Create a write watchpoint // Create a write watchpoint
Map<String, Object> watchpoint = new HashMap<String, Object>(); Map<String, Object> watchpoint = new HashMap<String, Object>();
watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG);
@ -3330,16 +3326,8 @@ public class MIBreakpointsTest extends BaseTestCase {
@Ignore("All GDBs seem to have a bug in this situation") @Ignore("All GDBs seem to have a bug in this situation")
@Test @Test
public void breakpointHit_WatchpointOutOfScope() throws Throwable { public void breakpointHit_WatchpointOutOfScope() throws Throwable {
// Run to the point where the variable is initialized // Run to the point where the variable is initialized
String fileName = SOURCE_FILE; insertAndRunToLineBreakpoint(LINE_NUMBER_4);
if (fileName.contains(" ")) { //$NON-NLS-1$
fileName = "\"" + fileName + "\""; //$NON-NLS-1$//$NON-NLS-2$
}
SyncUtil.addBreakpoint(fileName + ":" + LINE_NUMBER_4, true);
SyncUtil.resumeUntilStopped();
waitForBreakpointEvent(1); // bkpt-hit only; no bkpt-add event when using SyncUtil.addBreakpoint()
clearEventCounters();
// Create a write watchpoint // Create a write watchpoint
Map<String, Object> watchpoint = new HashMap<String, Object>(); Map<String, Object> watchpoint = new HashMap<String, Object>();