diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/gcore.exp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 00f4aec..b0e7ea9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2010-02-01 Daniel Jacobowitz <dan@codesourcery.com> + * gdb.base/gcore.exp (capture_command_output): Use + gdb_test_multiple. + +2010-02-01 Daniel Jacobowitz <dan@codesourcery.com> + * gdb.arch/thumb2-it.S (it_breakpoints): New function. * gdb.arch/thumb2-it.exp (test_it_break): New function. (Top level): Call it. diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp index 8ed966c..ee20284 100644 --- a/gdb/testsuite/gdb.base/gcore.exp +++ b/gdb/testsuite/gdb.base/gcore.exp @@ -69,14 +69,10 @@ proc capture_command_output { command prefix } { global expect_out set output_string "" - send_gdb "$command\n" - gdb_expect { + gdb_test_multiple "$command" "capture_command_output for $command" { -re "${command}\[\r\n\]+${prefix}(.*)\[\r\n\]+$gdb_prompt $" { set output_string $expect_out(1,string) } - default { - fail "capture_command_output failed on $command." - } } return $output_string } |