From: Pedro Alves <palves@redhat.com>
Date: Tue, 22 Apr 2014 18:15:48 +0000 (+0100)
Subject: Make gdb_continue_to_breakpoint fail quickly on internal errors.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06d9754365774595eae45a8548d5f24d7093006c;p=binutils-gdb.git

Make gdb_continue_to_breakpoint fail quickly on internal errors.

This switches the gdb_continue_to_breakpoint routine to use
gdb_test_multiple instead of send_gdb/gdb_expect, so that an internal
error is detected immediately, instead of failing on timeout.

gdb/testsuite/
2014-04-22  Pedro Alves  <palves@redhat.com>

	* lib/gdb.exp (gdb_continue_to_breakpoint): Use gdb_test_multiple
	instead of send_gdb/gdb_expect.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 865fd0c1e3c..1de6dc0864d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  Pedro Alves  <palves@redhat.com>
+
+	* lib/gdb.exp (gdb_continue_to_breakpoint): Use gdb_test_multiple
+	instead of send_gdb/gdb_expect.
+
 2014-04-22  Yao Qi  <yao@codesourcery.com>
 
 	* lib/trace-support.exp (generate_tracefile): New procedure.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 5411cb5b23f..d904b81f13d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -549,17 +549,10 @@ proc gdb_continue_to_breakpoint {name {location_pattern .*}} {
     global gdb_prompt
     set full_name "continue to breakpoint: $name"
 
-    send_gdb "continue\n"
-    gdb_expect {
+    gdb_test_multiple "continue" $full_name {
 	-re "(?:Breakpoint|Temporary breakpoint) .* (at|in) $location_pattern\r\n$gdb_prompt $" {
 	    pass $full_name
 	}
-	-re ".*$gdb_prompt $" {
-	    fail $full_name
-	}
-	timeout { 
-	    fail "$full_name (timeout)"
-	}
     }
 }