diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 00f4aeca24..b0e7ea937d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index 8ed966ca33..ee202840d2 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
 }