From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-33591-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 18927 invoked by alias); 4 Jun 2004 21:37:55 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 18920 invoked from network); 4 Jun 2004 21:37:54 -0000
Received: from unknown (HELO gateway.sf.frob.com) (64.81.54.130)
  by sourceware.org with SMTP; 4 Jun 2004 21:37:54 -0000
Received: from magilla.sf.frob.com (magilla.sf.frob.com [198.49.250.228])
	by gateway.sf.frob.com (Postfix) with ESMTP
	id C6B92357B; Fri,  4 Jun 2004 14:37:53 -0700 (PDT)
Received: from magilla.sf.frob.com (localhost.localdomain [127.0.0.1])
	by magilla.sf.frob.com (8.12.9/8.12.9) with ESMTP id i54LbrOi015653;
	Fri, 4 Jun 2004 14:37:53 -0700
Received: (from roland@localhost)
	by magilla.sf.frob.com (8.12.9/8.12.9/Submit) id i54LbrW9015649;
	Fri, 4 Jun 2004 14:37:53 -0700
Date: Fri, 04 Jun 2004 21:37:00 -0000
Message-Id: <200406042137.i54LbrW9015649@magilla.sf.frob.com>
From: Roland McGrath <roland@redhat.com>
To: gdb-patches@sources.redhat.com
Cc: Michael Elizabeth Chastain <mec.gnu@mindspring.com>
Subject: [committed testsuite patch] auxv.exp cascading failures
X-Shopping-List: 
   (1) Partial Johnny Carson lookalikes
   (2) Gigantic lion gloves
   (3) Audacious callous tables
   (4) Satirical minion expulsions
X-SW-Source: 2004-06/txt/msg00083.txt.bz2

I've committed this obvious fix to the test case I added a while back.
This fixes a report from Michael, but the message I got contains no PR number.


Thanks,
Roland


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

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


--- auxv.exp.~1.1.~	2004-03-16 13:39:57.000000000 -0800
+++ auxv.exp	2004-06-04 14:33:06.000000000 -0700
@@ -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 {}