From a11cfd87c0caa54f54f52fc9712e8994e265d744 Mon Sep 17 00:00:00 2001 From: Hui Zhu Date: Tue, 23 Apr 2013 03:20:21 +0000 Subject: [PATCH] 2013-04-23 Hui Zhu PR gdb/15293 * breakpoint.c (bpstat_what): Add BPSTAT_WHAT_SINGLE to bp_dprintf. 2013-04-23 Hui Zhu PR gdb/15293 * gdb.base/dprintf.exp: Add ignore command. --- gdb/ChangeLog | 6 ++++++ gdb/breakpoint.c | 5 ++++- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/dprintf.exp | 4 +++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 636f7765918..911353dfd0f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-04-23 Hui Zhu + + PR gdb/15293 + + * breakpoint.c (bpstat_what): Add BPSTAT_WHAT_SINGLE to bp_dprintf. + 2013-04-23 Hui Zhu PR gdb/15165 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 84c5b46273c..f155b9eb59e 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 c0188c0840c..df720531a2d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-04-23 Hui Zhu + + PR gdb/15293 + + * gdb.base/dprintf.exp: Add ignore command. + 2013-04-23 Hui Zhu PR gdb/15165 diff --git a/gdb/testsuite/gdb.base/dprintf.exp b/gdb/testsuite/gdb.base/dprintf.exp index 253e016b018..71f35545d70 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"