aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/break-interp.exp16
2 files changed, 12 insertions, 9 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5ad723f..f94b56b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2010-10-12 Jan Kratochvil <jan.kratochvil@redhat.com>
+ * gdb.base/break-interp.exp (test_ld): Replace gdb_expect by
+ gdb_test_multiple.
+
+2010-10-12 Jan Kratochvil <jan.kratochvil@redhat.com>
+
* gdb.base/break-interp.exp: Use ldlags for linking flags.
* gdb.base/prelink.exp: Likewise.
* gdb.base/solib-nodir.exp: Likewise.
diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index d3bda44..75e0ad7 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -442,21 +442,19 @@ proc test_ld {file ifmain trynosym displacement} {
if $ifmain {
reach "_dl_debug_state" run $displacement
- # Use two separate gdb_expect statements to avoid timeouts due to
- # slow processing of wildcard capturing long output
+ # Use two separate gdb_test_multiple statements to avoid timeouts due
+ # to slow processing of wildcard capturing long output
set test "info files"
set entrynohex ""
- send_gdb "$test\n"
- gdb_expect {
+ gdb_test_multiple $test $test {
-re "\r\n\[\t \]*Entry point:\[\t \]*0x(\[0-9a-f\]+)\r\n" {
set entrynohex $expect_out(1,string)
- gdb_expect {
- -re "$gdb_prompt $" { pass $test }
- timeout { fail "$test (timeout)" }
+ gdb_test_multiple "" $test {
+ -re "\r\n$gdb_prompt $" {
+ pass $test
+ }
}
}
- -re ".*$gdb_prompt $" { fail $test }
- timeout { fail "$test (timeout)" }
}
# `info sym' cannot be tested for .opd as the binary may not have