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.

diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index b50147032c45a93c3ff87a433d9cd9795491d0ff..cb064f560a52c2d60607c461427f912197d33968 100644 (file)
--- 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 {}
     }