From: Roland McGrath <roland@gnu.org>
Date: Fri, 4 Jun 2004 21:36:06 +0000 (+0000)
Subject: 2004-06-04  Roland McGrath  <roland@redhat.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f1ed375c8541c42e7f78865b5c497244699097b1;p=deliverable%2Fbinutils-gdb.git

2004-06-04  Roland McGrath  <roland@redhat.com>

	* gdb.base/auxv.exp (fetch_auxv): Consume output fully through
	next gdb prompt.
---

diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index 3a509b9824..b50147032c 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -80,14 +80,17 @@ proc fetch_auxv {test} {
 	-re "info auxv\[\r\n\]+" {
 	    exp_continue
 	}
-	-ex "The program has no auxiliary information now" {
+	-re "The program has no auxiliary information now.*$" {
 	    set bad 1
+	    exp_continue
 	}
-	-ex "Auxiliary vector is empty" {
+	-re "Auxiliary vector is empty.*$" {
 	    set bad 1
+	    exp_continue
 	}
-	-ex "No auxiliary vector found" {
+	-re "No auxiliary vector found.*$" {
 	    set bad 1
+	    exp_continue
 	}
 	-re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\[\r\n\]+" {
 	    lappend auxv_lines $expect_out(0,string)
@@ -99,12 +102,13 @@ proc fetch_auxv {test} {
 	    lappend auxv_lines $expect_out(0,string)
 	    exp_continue
 	}
-	-re ".*$gdb_prompt $" {
-	    incr bad
-	}
 	-re "^\[^\r\n\]+\[\r\n\]+" {
 	    warning "Unrecognized output: $expect_out(0,string)"
 	    set bad 1
+	    exp_continue
+	}
+	-re ".*$gdb_prompt $" {
+	    incr bad
 	}
     }] != 0} {
 	return {}