aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorHui Zhu <teawater@gmail.com>2013-04-23 03:20:21 +0000
committerHui Zhu <teawater@gmail.com>2013-04-23 03:20:21 +0000
commita11cfd87c0caa54f54f52fc9712e8994e265d744 (patch)
tree32893939a1d0f1131a5fc52d1546f6a980b40206 /gdb
parent2d9442cc40e3cda16f5a7515729f38d8637354f3 (diff)
downloadgdb-a11cfd87c0caa54f54f52fc9712e8994e265d744.zip
gdb-a11cfd87c0caa54f54f52fc9712e8994e265d744.tar.gz
gdb-a11cfd87c0caa54f54f52fc9712e8994e265d744.tar.bz2
2013-04-23 Hui Zhu <hui@codesourcery.com>
PR gdb/15293 * breakpoint.c (bpstat_what): Add BPSTAT_WHAT_SINGLE to bp_dprintf. 2013-04-23 Hui Zhu <hui@codesourcery.com> PR gdb/15293 * gdb.base/dprintf.exp: Add ignore command.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/breakpoint.c5
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/dprintf.exp4
4 files changed, 19 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 636f776..911353d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2013-04-23 Hui Zhu <hui@codesourcery.com>
+ PR gdb/15293
+
+ * breakpoint.c (bpstat_what): Add BPSTAT_WHAT_SINGLE to bp_dprintf.
+
+2013-04-23 Hui Zhu <hui@codesourcery.com>
+
PR gdb/15165
* breakpoint.c (dprintf_print_recreate): New.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 84c5b46..f155b9e 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5529,7 +5529,10 @@ bpstat_what (bpstat bs_head)
break;
case bp_dprintf:
- this_action = BPSTAT_WHAT_STOP_SILENT;
+ if (bs->stop)
+ this_action = BPSTAT_WHAT_STOP_SILENT;
+ else
+ this_action = BPSTAT_WHAT_SINGLE;
break;
default:
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c0188c0..df72053 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2013-04-23 Hui Zhu <hui@codesourcery.com>
+ PR gdb/15293
+
+ * gdb.base/dprintf.exp: Add ignore command.
+
+2013-04-23 Hui Zhu <hui@codesourcery.com>
+
PR gdb/15165
* gdb.base/save-bp.exp: Add test for dprintf.
diff --git a/gdb/testsuite/gdb.base/dprintf.exp b/gdb/testsuite/gdb.base/dprintf.exp
index 253e016..71f3554 100644
--- a/gdb/testsuite/gdb.base/dprintf.exp
+++ b/gdb/testsuite/gdb.base/dprintf.exp
@@ -40,6 +40,8 @@ gdb_breakpoint "main"
gdb_test "dprintf foo,\"At foo entry\\n\"" \
"Dprintf .*"
+gdb_test "ignore \$bpnum 1" ".*Will ignore next crossing of breakpoint.*"
+
gdb_test "dprintf $dp_location1,\"arg=%d, g=%d\\n\", arg, g" \
"Dprintf .*"
@@ -61,7 +63,7 @@ gdb_run_cmd
gdb_test "" "Breakpoint"
-gdb_test "continue" "At foo entry.*arg=1234, g=1234.*" "1st dprintf, gdb"
+gdb_test "continue" "arg=1234, g=1234.*" "1st dprintf, gdb"
gdb_test "continue" "At foo entry.*arg=1235, g=2222.*" "2nd dprintf, gdb"