From e0cc584ecf55a751d86ba66224af3e50e32fbb5f Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Tue, 12 Oct 2010 17:17:36 +0000 Subject: [PATCH] * break-interp.exp (test_ld): Use two separate gdb_expect statements for the "info files" test to avoid timeouts on slow machines. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/break-interp.exp | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 33405233378..653edcdb1bd 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-10-12 Ulrich Weigand + + * break-interp.exp (test_ld): Use two separate gdb_expect statements + for the "info files" test to avoid timeouts on slow machines. + 2010-10-11 Jan Kratochvil * gdb.cp/infcall-dlopen.cc (openlib): Support NULL FILENAME. diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index 4025083e715..904fbcf948e 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -442,14 +442,23 @@ 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 set test "info files" set entrynohex "" - gdb_test_multiple $test $test { - -re "\r\n\[\t \]*Entry point:\[\t \]*0x(\[0-9a-f\]+)\r\n.*$gdb_prompt $" { + send_gdb "$test\n" + gdb_expect { + -re "\r\n\[\t \]*Entry point:\[\t \]*0x(\[0-9a-f\]+)\r\n" { set entrynohex $expect_out(1,string) - pass $test + gdb_expect { + -re "$gdb_prompt $" { pass $test } + timeout { fail "$test (timeout)" } + } } + -re ".*$gdb_prompt $" { fail $test } + timeout { fail "$test (timeout)" } } + # `info sym' cannot be tested for .opd as the binary may not have # symbols. if {[istarget powerpc64-*] && [is_lp64_target]} { -- 2.30.2