From: Roland McGrath <roland@gnu.org>
Date: Sat, 5 Jun 2004 00:09:26 +0000 (+0000)
Subject: 2004-06-04  Roland McGrath  <roland@redhat.com>
X-Git-Tag: gdb_6_2-2004-07-10-gmt-branchpoint~339
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=037ebf355b58ba64a026c27d636eeeff981bdadc;p=pf3gnuchains%2Fpf3gnuchains4x.git

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 b50147032c..cb064f560a 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 {}
     }