From 5bf480a5cb916990831390cd06149459fad67627 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 11 Jan 2013 00:31:58 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.base/dprintf.exp: Check the output of 'info breakpoints' for dprintf. * gdb.mi/mi-breakpoint-changed.exp (test_insert_delete_modify): Check the fields in "=breakpoint-created" for dprintf. --- gdb/testsuite/ChangeLog | 7 ++++++ gdb/testsuite/gdb.base/dprintf.exp | 22 +++++++++++++++++++ .../gdb.mi/mi-breakpoint-changed.exp | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index dde24e0cc02..6b2994c18b4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2013-01-11 Yao Qi + + * gdb.base/dprintf.exp: Check the output of 'info breakpoints' + for dprintf. + * gdb.mi/mi-breakpoint-changed.exp (test_insert_delete_modify): + Check the fields in "=breakpoint-created" for dprintf. + 2012-12-25 Jan Kratochvil * gdb.mi/mi-fullname-deleted.exp: New file. diff --git a/gdb/testsuite/gdb.base/dprintf.exp b/gdb/testsuite/gdb.base/dprintf.exp index f99d75ec973..fb626fa0b1c 100644 --- a/gdb/testsuite/gdb.base/dprintf.exp +++ b/gdb/testsuite/gdb.base/dprintf.exp @@ -43,6 +43,17 @@ gdb_test "dprintf foo,\"At foo entry\\n\"" \ gdb_test "dprintf $dp_location1,\"arg=%d, g=%d\\n\", arg, g" \ "Dprintf .*" +gdb_test_sequence "info breakpoints" "dprintf info 1" { + "\[\r\n\]Num Type Disp Enb Address What" + "\[\r\n\]2 breakpoint" + "\[\r\n\]3 dprintf" + "\[\r\n\] printf \"At foo entry\\\\n\"" + "\[\r\n\] continue" + "\[\r\n\]4 dprintf" + "\[\r\n\] printf \"arg=%d, g=%d\\\\n\", arg, g" + "\[\r\n\] continue" +} + gdb_test "break $bp_location1" \ "Breakpoint .*" @@ -107,6 +118,17 @@ if $target_can_dprintf { gdb_test "continue" "Breakpoint \[0-9\]+, foo .*" "2nd dprintf, agent" + gdb_test_sequence "info breakpoints" "dprintf info 2" { + "\[\r\n\]Num Type Disp Enb Address What" + "\[\r\n\]2 breakpoint" + "\[\r\n\]\tbreakpoint already hit 2 times" + "\[\r\n\]3 dprintf" + "\[\r\n\]\tbreakpoint already hit 2 times" + "\[\r\n\] agent-printf \"At foo entry\\\\n\"" + "\[\r\n\]4 dprintf" + "\[\r\n\]\tbreakpoint already hit 2 times" + "\[\r\n\] agent-printf \"arg=%d, g=%d\\\\n\", arg, g" + } } gdb_test "set dprintf-style foobar" "Undefined item: \"foobar\"." \ diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp index 7ce314d08ee..fd32698d5bf 100644 --- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp @@ -96,7 +96,7 @@ proc test_insert_delete_modify { } { $test set test "dprintf marker, \"arg\" \"" mi_gdb_test $test \ - {.*=breakpoint-created,bkpt=\{number="6",type="dprintf".*\}.*\n\^done} \ + {.*=breakpoint-created,bkpt=\{number="6",type="dprintf".*,script=\{\"printf \\\\\"arg\\\\\" \\\\\"\",\"continue\"\}.*\}\r\n\^done} \ $test # 2. when modifying condition -- 2.30.2