From 6c2d1a6bc97ac98486be4689e3a1fa054dcd4f01 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 1 Apr 2008 15:18:30 +0000 Subject: [PATCH] 2008-04-01 Marc Khouzam * gdb.mi/mi-var-display.exp: Stop at end of do_special_tests instead of beginning to make an extra test pass. * gdb.mi/mi2-var-display.exp: Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.mi/mi-var-display.exp | 10 +++++----- gdb/testsuite/gdb.mi/mi2-var-display.exp | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 299ac869eae..7bf51281705 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-04-01 Marc Khouzam + + * gdb.mi/mi-var-display.exp: Stop at end of do_special_tests + instead of beginning to make an extra test pass. + * gdb.mi/mi2-var-display.exp: Likewise. + 2008-03-31 Maciej W. Rozycki * gdb.base/break.exp: Mark failures as such. Fix formatting. diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp index 83b4e95efe3..7af9703665a 100644 --- a/gdb/testsuite/gdb.mi/mi-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi-var-display.exp @@ -329,17 +329,17 @@ mi_gdb_test "-var-delete weird" \ # # ##### ##### -# Stop in "do_special_tests" +# Stop at the end of "do_special_tests" -set line_dst_a_1 [gdb_get_line_number "a = 1;"] +set line_dst_incr_a_2 [gdb_get_line_number "incr_a(2);"] -mi_gdb_test "200-break-insert do_special_tests" \ - "200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_a_1\",times=\"0\"\}" \ +mi_gdb_test "200-break-insert $line_dst_incr_a_2" \ + "200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_incr_a_2\",times=\"0\"\}" \ "break-insert operation" send_gdb "-exec-continue\n" gdb_expect { - -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dst_a_1\"\}\r\n$mi_gdb_prompt$" { + -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dst_incr_a_2\"\}\r\n$mi_gdb_prompt$" { pass "continue to do_special_tests" } timeout { diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp index 6be3bf44fc3..e98b3cf8fd8 100644 --- a/gdb/testsuite/gdb.mi/mi2-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp @@ -331,15 +331,15 @@ mi_gdb_test "-var-delete weird" \ # Stop in "do_special_tests" -set line_dst_a_1 [gdb_get_line_number "a = 1;"] +set line_dst_incr_a_2 [gdb_get_line_number "incr_a(2);"] -mi_gdb_test "200-break-insert do_special_tests" \ - "200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_a_1\",times=\"0\"\}" \ +mi_gdb_test "200-break-insert $line_dst_incr_a_2" \ + "200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_incr_a_2\",times=\"0\"\}" \ "break-insert operation" send_gdb "-exec-continue\n" gdb_expect { - -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dst_a_1\"\}\r\n$mi_gdb_prompt$" { + -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dst_incr_a_2\"\}\r\n$mi_gdb_prompt$" { pass "continue to do_special_tests" } timeout { -- 2.30.2