From c1b5970d70592c1788d42520ec5d9c1b7d9b2a02 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 5 Jun 2004 00:09:26 +0000 Subject: [PATCH] 2004-06-04 Roland McGrath * gdb.base/auxv.exp (fetch_auxv): Revert last change and fix it differently to be robust to output buffering differences. --- gdb/testsuite/gdb.base/auxv.exp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp index b50147032c4..cb064f560a5 100644 --- a/gdb/testsuite/gdb.base/auxv.exp +++ b/gdb/testsuite/gdb.base/auxv.exp @@ -80,15 +80,15 @@ proc fetch_auxv {test} { -re "info auxv\[\r\n\]+" { exp_continue } - -re "The program has no auxiliary information now.*$" { + -ex "The program has no auxiliary information now" { set bad 1 exp_continue } - -re "Auxiliary vector is empty.*$" { + -ex "Auxiliary vector is empty" { set bad 1 exp_continue } - -re "No auxiliary vector found.*$" { + -ex "No auxiliary vector found" { set bad 1 exp_continue } @@ -102,14 +102,16 @@ proc fetch_auxv {test} { lappend auxv_lines $expect_out(0,string) exp_continue } - -re "^\[^\r\n\]+\[\r\n\]+" { - warning "Unrecognized output: $expect_out(0,string)" - set bad 1 - exp_continue - } -re ".*$gdb_prompt $" { incr bad } + -re "^\[^\r\n\]+\[\r\n\]+" { + if {!$bad} { + warning "Unrecognized output: $expect_out(0,string)" + set bad 1 + } + exp_continue + } }] != 0} { return {} } -- 2.30.2