diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/extern-c.exp | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5f48f55..61f6193 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2010-04-01 Pedro Alves <pedro@codesourcery.com> + * gdb.base/commands.exp: Adjust. + * gdb.cp/extern-c.exp: Adjust. + +2010-04-01 Pedro Alves <pedro@codesourcery.com> + * gdb.trace/collection.c (local_test_func): Define a local struct, and instanciate it. diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index ee3d787..bc81f06 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -299,7 +299,7 @@ proc watchpoint_command_test {} { send_gdb "commands $wp_id\n" gdb_expect { - -re "Type commands for all specified breakpoints.*>" { + -re "Type commands for breakpoint.*, one per line.*>" { pass "begin commands on watch" } -re "$gdb_prompt $" {fail "begin commands on watch"} @@ -452,7 +452,7 @@ proc bp_deleted_in_command_test {} { send_gdb "commands\n" gdb_expect { - -re "Type commands for all specified breakpoints.*>" { + -re "Type commands for breakpoint.*>" { pass "begin commands in bp_deleted_in_command_test" } -re "$gdb_prompt $" {fail "begin commands in bp_deleted_in_command_test"} @@ -519,7 +519,7 @@ proc temporary_breakpoint_commands {} { send_gdb "commands\n" gdb_expect { - -re "Type commands for all specified breakpoints.*>" { + -re "Type commands for breakpoint.*>" { pass "begin commands in bp_deleted_in_command_test" } -re "$gdb_prompt $" {fail "begin commands in bp_deleted_in_command_test"} diff --git a/gdb/testsuite/gdb.cp/extern-c.exp b/gdb/testsuite/gdb.cp/extern-c.exp index 5ad4e9c..275ef2d 100644 --- a/gdb/testsuite/gdb.cp/extern-c.exp +++ b/gdb/testsuite/gdb.cp/extern-c.exp @@ -48,7 +48,7 @@ gdb_test "rbreak c_funcs" \ # Test that "commands" without an argument puts commands on both # breakpoints. gdb_test_multiple "commands" "set commands on multiple breakpoints" { - -re "Type commands for all specified breakpoints\r\nEnd with a line saying just \"end\".\r\n>$" { + -re "Type commands for breakpoint\\(s\\) 3-4, one per line\.\r\nEnd with a line saying just \"end\".\r\n>$" { gdb_test_multiple "set \$counter = \$counter + 1\nend" \ "command details for multiple breakpoints" { -re "$gdb_prompt $" { |