diff options
| author | Roland McGrath <roland@gnu.org> | 2004-06-05 00:09:26 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-06-05 00:09:26 +0000 |
| commit | c1b5970d70592c1788d42520ec5d9c1b7d9b2a02 (patch) | |
| tree | b080d67980ad6963d365fd6ea84a54b0f069e4da /gdb/testsuite | |
| parent | c0a278047700412e44c364fd118fdc031fd53c77 (diff) | |
| download | gdb-c1b5970d70592c1788d42520ec5d9c1b7d9b2a02.zip gdb-c1b5970d70592c1788d42520ec5d9c1b7d9b2a02.tar.gz gdb-c1b5970d70592c1788d42520ec5d9c1b7d9b2a02.tar.bz2 | |
2004-06-04 Roland McGrath <roland@redhat.com>
* gdb.base/auxv.exp (fetch_auxv): Revert last change and fix it
differently to be robust to output buffering differences.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/gdb.base/auxv.exp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp index b501470..cb064f5 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 {} } |