From f001fc32d051c58c572c470921b35d14d02ab20b Mon Sep 17 00:00:00 2001 From: John Cortell Date: Tue, 1 Jun 2010 18:44:26 +0000 Subject: [PATCH] Fixed intermittent test failure caused by buggy test. A breakpoint hit can arrive after SyncUtil.resumeUntilStopped() returns. The test needs to call waitForBreakpointEvent() afterwards. --- .../eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java index 16b0ee583e8..d635eb66022 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java @@ -2054,6 +2054,7 @@ public class MIBreakpointsTest extends BaseTestCase { } 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 @@ -2109,6 +2110,7 @@ public class MIBreakpointsTest extends BaseTestCase { } 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 @@ -2165,6 +2167,7 @@ public class MIBreakpointsTest extends BaseTestCase { } 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 @@ -3192,6 +3195,7 @@ public class MIBreakpointsTest extends BaseTestCase { } 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 @@ -3262,6 +3266,7 @@ public class MIBreakpointsTest extends BaseTestCase { } 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 @@ -3333,6 +3338,7 @@ public class MIBreakpointsTest extends BaseTestCase { } 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