From db25f29d62b64de9a1f2bf1bbd71bd08c5347c98 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 1 Feb 2010 17:15:36 +0000 Subject: [PATCH] * gdb.base/gcore.exp (capture_command_output): Use gdb_test_multiple. --- gdb/testsuite/ChangeLog | 5 +++++ 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 00f4aeca249..b0e7ea937d1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-02-01 Daniel Jacobowitz + + * gdb.base/gcore.exp (capture_command_output): Use + gdb_test_multiple. + 2010-02-01 Daniel Jacobowitz * gdb.arch/thumb2-it.S (it_breakpoints): New function. diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp index 8ed966ca33d..ee202840d27 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 } -- 2.30.2