Bug 532077: Preserve Ignore Count set in the platform breakpoint

Change-Id: I19ad64254b0e9ed55114f2e83fe2f09e2aeac83c

2 files changed, 0 insertions, 24 deletions

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java
index f2bacbcb11e..76b6b83aa5a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java
@@ -756,9 +756,6 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService implements IMI
 			if (!plBpt.getCondition().equals(miBpt.getCondition())) {
 				plBpt.setCondition(miBpt.getCondition());
 			}
-			if (plBpt.getIgnoreCount() != miBpt.getIgnoreCount()) {
-				plBpt.setIgnoreCount(miBpt.getIgnoreCount());
-			}
 			if (oldData.isPending() != miBpt.isPending()) {
 				if (miBpt.isPending()) {
 					plBpt.decrementInstallCount();
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java
index 9807f28e5b5..6365b5e2dbb 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java
@@ -566,22 +566,6 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase {
 		waitForBreakpointEvent(IBreakpointsUpdatedEvent.class);
 		Assert.assertTrue(plBpt.isEnabled());
 
-		// Set the ignore count of the console breakpoint and 
-		// verify that the platform breakpoint's ignore count 
-		// is updated.
-		setConsoleBreakpointIgnoreCount(miBpts[0].getNumber(), 5);
-		flushCache.run();
-		waitForBreakpointEvent(IBreakpointsUpdatedEvent.class);
-		Assert.assertTrue(plBpt.getIgnoreCount() == 5);
-
-		// Reset the ignore count of the console breakpoint and 
-		// verify that the platform breakpoint's ignore count 
-		// is updated.
-		setConsoleBreakpointIgnoreCount(miBpts[0].getNumber(), 0);
-		flushCache.run();
-		waitForBreakpointEvent(IBreakpointsUpdatedEvent.class);
-		Assert.assertTrue(plBpt.getIgnoreCount() == 0);
-
 		// Set the condition of the console breakpoint and 
 		// verify that the platform breakpoint's condition 
 		// is updated.
@@ -705,11 +689,6 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase {
   		queueConsoleCommand(String.format("%s %s", cmd, bpId));
   	}
 
-  	private void setConsoleBreakpointIgnoreCount(String bpId, int ignoreCount) throws Throwable {
-  		Assert.assertTrue(ignoreCount >= 0);
-  		queueConsoleCommand(String.format("ignore %s %d", bpId, ignoreCount));
-  	}
-
   	private void setConsoleBreakpointCondition(String bpId, String condition) throws Throwable {
   		queueConsoleCommand(String.format("condition %s %s", bpId, condition));
   	}