diff options
author | Nathan Sidwell <nathan@codesourcery.com> | 2006-06-09 20:11:08 +0000 |
---|---|---|
committer | Nathan Sidwell <nathan@codesourcery.com> | 2006-06-09 20:11:08 +0000 |
commit | 799124aeb74dc2d824847684ecc8d0c3cb273f66 (patch) | |
tree | 901c35869fd29b995063698f4cafd8ea732820c6 | |
parent | a85a557c84939f8b170746e89082a36d31603d59 (diff) | |
download | gdb-799124aeb74dc2d824847684ecc8d0c3cb273f66.tar.gz |
gdb/testsuite/
* gdb.cp/anon-union.cc: Add code at end of function.
* gdb.cp/anon-union.exp: Adjust end of function breakpoint.
* gdb.mi/var-cmd.c: Add code at end of function.
* gdb.mi/mi-var-display.exp: Adjust end of next.
* gdb.mi/mi2-var-display.exp: Likewise.
-rw-r--r-- | ChangeLog.csl | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.cp/anon-union.cc | 1 | ||||
-rw-r--r-- | gdb/testsuite/gdb.cp/anon-union.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.mi/mi-var-display.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.mi/mi2-var-display.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.mi/var-cmd.c | 1 |
6 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index ce94383132d..95c26490dd6 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,6 +1,13 @@ 2006-06-09 Nathan Sidwell <nathan@codesourcery.com> gdb/testsuite/ + * gdb.cp/anon-union.cc: Add code at end of function. + * gdb.cp/anon-union.exp: Adjust end of function breakpoint. + * gdb.mi/var-cmd.c: Add code at end of function. + * gdb.mi/mi-var-display.exp: Adjust end of next. + * gdb.mi/mi2-var-display.exp: Likewise. + + gdb/testsuite/ * gdb.base/break.c: Add breakpoint 10a marker. * gdb.base/break.exp: Check breakpoint on } diff --git a/gdb/testsuite/gdb.cp/anon-union.cc b/gdb/testsuite/gdb.cp/anon-union.cc index 0b3fd130aeb..fa75251778a 100644 --- a/gdb/testsuite/gdb.cp/anon-union.cc +++ b/gdb/testsuite/gdb.cp/anon-union.cc @@ -52,4 +52,5 @@ int main() w = 45; + int j = 0; } diff --git a/gdb/testsuite/gdb.cp/anon-union.exp b/gdb/testsuite/gdb.cp/anon-union.exp index 4c34dcfcd90..c63cfafd8b5 100644 --- a/gdb/testsuite/gdb.cp/anon-union.exp +++ b/gdb/testsuite/gdb.cp/anon-union.exp @@ -288,7 +288,7 @@ gdb_expect { # Step over next assignment to w send_gdb "next\n" gdb_expect { - -re "55\[ \t\]*\}\r\n$gdb_prompt $" { + -re "55\[ \t\]*int j = 0;\r\n$gdb_prompt $" { pass "next 4" } -re ".*$gdb_prompt $" { fail "next 4" } diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp index 45471f7dcb0..2e107bd8a33 100644 --- a/gdb/testsuite/gdb.mi/mi-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi-var-display.exp @@ -40,16 +40,16 @@ mi_delete_breakpoints mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load ${binfile} -set line_dct_close_brace [expr [gdb_get_line_number "snp2.long_ptr = &z3;"] + 1] +set line_dct_end [gdb_get_line_number "{int a = 0;}"] -mi_gdb_test "200-break-insert $line_dct_close_brace" \ - "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_children_tests\",file=\".*var-cmd.c\",line=\"$line_dct_close_brace\",times=\"0\"\}" \ +mi_gdb_test "200-break-insert $srcfile:$line_dct_end" \ + "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_children_tests\",file=\".*var-cmd.c\",line=\"$line_dct_end\",times=\"0\"\}" \ "break-insert operation" mi_run_cmd # The running part has been checked already by mi_run_cmd gdb_expect { - -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dct_close_brace\"\}\r\n$mi_gdb_prompt$" { + -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dct_end\"\}\r\n$mi_gdb_prompt$" { pass "run to do_children_tests" } -re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"} diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp index 5ad4731edae..e8201d5d2db 100644 --- a/gdb/testsuite/gdb.mi/mi2-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp @@ -40,16 +40,16 @@ mi_delete_breakpoints mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load ${binfile} -set line_dct_close_brace [expr [gdb_get_line_number "snp2.long_ptr = &z3;"] + 1] +set line_dct_end [gdb_get_line_number "{int a = 0;}"] -mi_gdb_test "200-break-insert $line_dct_close_brace" \ - "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_children_tests\",file=\".*var-cmd.c\",line=\"$line_dct_close_brace\",times=\"0\"\}" \ +mi_gdb_test "200-break-insert $srcfile:$line_dct_end" \ + "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_children_tests\",file=\".*var-cmd.c\",line=\"$line_dct_end\",times=\"0\"\}" \ "break-insert operation" mi_run_cmd # The running part has been checked already by mi_run_cmd gdb_expect { - -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"$line_dct_close_brace\"\}\r\n$mi_gdb_prompt$" { + -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"$line_dct_end\"\}\r\n$mi_gdb_prompt$" { pass "run to do_children_tests" } -re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"} diff --git a/gdb/testsuite/gdb.mi/var-cmd.c b/gdb/testsuite/gdb.mi/var-cmd.c index 2a297d2c02d..e7daeacea89 100644 --- a/gdb/testsuite/gdb.mi/var-cmd.c +++ b/gdb/testsuite/gdb.mi/var-cmd.c @@ -278,6 +278,7 @@ do_children_tests (void) snp0.long_ptr = &y3; snp1.long_ptr = &x3; snp2.long_ptr = &z3; + {int a = 0;} } void |