aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2014-04-22 19:15:48 +0100
committerPedro Alves <palves@redhat.com>2014-04-22 19:15:48 +0100
commit06d9754365774595eae45a8548d5f24d7093006c (patch)
tree5107dc0c6ad6522fb90050b16c0607858a55ae00
parentfad16e308cc96f460d74cf240b76b414c331d7fa (diff)
downloadgdb-06d9754365774595eae45a8548d5f24d7093006c.zip
gdb-06d9754365774595eae45a8548d5f24d7093006c.tar.gz
gdb-06d9754365774595eae45a8548d5f24d7093006c.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/gdb.exp9
2 files changed, 6 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 865fd0c..1de6dc0 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 5411cb5..d904b81 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)"
- }
}
}