aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2014-10-12 21:52:39 +0200
committerJan Kratochvil <jan.kratochvil@redhat.com>2014-10-12 21:52:39 +0200
commit99894e1175c04ef470761406c0d20f61f5a7e9ba (patch)
tree34691cd93e5116fde6cff900c74cf25fa1fe377a
parent6e1ac5a3735abf8284c09563fdcba18f88226abb (diff)
downloadgdb-99894e1175c04ef470761406c0d20f61f5a7e9ba.zip
gdb-99894e1175c04ef470761406c0d20f61f5a7e9ba.tar.gz
gdb-99894e1175c04ef470761406c0d20f61f5a7e9ba.tar.bz2
Fix "save breakpoints" for "disable $bpnum" command.
gdb/ChangeLog 2014-10-12 Miroslav Franc <mfranc@redhat.com> Fix "save breakpoints" for "disable $bpnum" command. * breakpoint.c (save_breakpoints): Add $bpnum for disable. gdb/testsuite/ChangeLog 2014-10-12 Jan Kratochvil <jan.kratochvil@redhat.com> Fix "save breakpoints" for "disable $bpnum" command. * gdb.base/save-bp.c (main): Add label. * gdb.base/save-bp.exp: Add 8th disabled breakpoint. Match it.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/breakpoint.c2
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/save-bp.c2
-rw-r--r--gdb/testsuite/gdb.base/save-bp.exp6
5 files changed, 19 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e15e53..724a971 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-12 Miroslav Franc <mfranc@redhat.com>
+
+ Fix "save breakpoints" for "disable $bpnum" command.
+ * breakpoint.c (save_breakpoints): Add $bpnum for disable.
+
2014-10-10 Pedro Alves <palves@redhat.com>
* Makefile.in (ALL_TARGET_OBS): Remove mips-irix-tdep.o and solib-irix.o.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 3044916..a144a7e 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -16130,7 +16130,7 @@ save_breakpoints (char *filename, int from_tty,
}
if (tp->enable_state == bp_disabled)
- fprintf_unfiltered (fp, "disable\n");
+ fprintf_unfiltered (fp, "disable $bpnum\n");
/* If this is a multi-location breakpoint, check if the locations
should be individually disabled. Watchpoint locations are
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fdd18d7..bb362dc 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2014-10-12 Jan Kratochvil <jan.kratochvil@redhat.com>
+ Fix "save breakpoints" for "disable $bpnum" command.
+ * gdb.base/save-bp.c (main): Add label.
+ * gdb.base/save-bp.exp: Add 8th disabled breakpoint. Match it.
+
+2014-10-12 Jan Kratochvil <jan.kratochvil@redhat.com>
+
* gdb.base/save-bp.exp (info break): Use gdb_test_sequence.
2014-10-11 Yao Qi <yao@codesourcery.com>
diff --git a/gdb/testsuite/gdb.base/save-bp.c b/gdb/testsuite/gdb.base/save-bp.c
index 9a72fe8..f01f031 100644
--- a/gdb/testsuite/gdb.base/save-bp.c
+++ b/gdb/testsuite/gdb.base/save-bp.c
@@ -31,6 +31,6 @@ main (void)
break_me (); /* Try a condition-specific breakpoint. */
break_me (); /* Finally, try a breakpoint with commands. */
- return 0;
+ return 0; /* Return line. */
}
diff --git a/gdb/testsuite/gdb.base/save-bp.exp b/gdb/testsuite/gdb.base/save-bp.exp
index 61f647c..c8c9481 100644
--- a/gdb/testsuite/gdb.base/save-bp.exp
+++ b/gdb/testsuite/gdb.base/save-bp.exp
@@ -47,6 +47,10 @@ gdb_test "commands\nsilent\nend" "End with.*" "add breakpoint commands"
gdb_test "dprintf ${srcfile}:${loc_bp5},\"At foo entry\\n\"" "Dprintf .*"
+set loc_bp8 [gdb_get_line_number "Return line"]
+gdb_breakpoint "${srcfile}:${loc_bp8}"
+gdb_test_no_output {disable $bpnum}
+
# Now, save the breakpoints into a file...
if {[is_remote host]} {
set bps bps
@@ -71,6 +75,7 @@ gdb_test "source $bps" "" "source bps"
# Now, verify that all breakpoints have been created correctly...
set bp_row_start "\[0-9\]+ +breakpoint +keep +y +0x\[0-9a-f\]+ +in"
+set disabled_row_start "\[0-9\]+ +breakpoint +keep +n +0x\[0-9a-f\]+ +in"
set dprintf_row_start "\[0-9\]+ +dprintf +keep +y +0x\[0-9a-f\]+ +in"
gdb_test_sequence "info break" "info break" [list \
"\[\r\n\]+Num +Type +Disp +Enb +Address +What" \
@@ -84,4 +89,5 @@ gdb_test_sequence "info break" "info break" [list \
"\[\r\n\]+\[ \t\]+silent" \
"\[\r\n\]+$dprintf_row_start main at \[^\r\n\]*$srcfile:$loc_bp5" \
"\[\r\n\]+\[ \t\]+printf" \
+ "\[\r\n\]+$disabled_row_start main at \[^\r\n\]*$srcfile:$loc_bp8" \
]