From 7ddebc7e5611da666dbc49457d88aff2e983c572 Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@redhat.com>
Date: Wed, 4 Sep 2002 21:05:07 +0000
Subject: [PATCH]         * lib/mi-support.exp: Update copyright.        
 (mi_gdb_test): Increase the priority of the expected pattern         so that
 it matches gdb_test.

---
 gdb/testsuite/ChangeLog          |  6 ++++++
 gdb/testsuite/lib/mi-support.exp | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d0f9ef281c..7f3f2bf5fb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-04  Keith Seitz  <keiths@redhat.com>
+
+	* lib/mi-support.exp: Update copyright.
+	(mi_gdb_test): Increase the priority of the expected pattern
+	so that it matches gdb_test.
+
 2002-09-03  Keith Seitz  <keiths@redhat.com>
 
 	* lib/gdb.exp (gdb_compile_pthreads): Fix "build_bin" typo.
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index d3861e1461..451dceaf60 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -1,4 +1,4 @@
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -470,6 +470,12 @@ proc mi_gdb_test { args } {
 	    gdb_exit
 	    gdb_start
 	    set result -1
+	}
+	 -re "\[\r\n\]*($pattern)\[\r\n\]+$mi_gdb_prompt\[ \]*$" {
+	    if ![string match "" $message] then {
+		pass "$message"
+	    }
+	    set result 0
 	}
 	 -re "(${question_string})$" {
 	    send_gdb "$response_string\n";
@@ -484,12 +490,6 @@ proc mi_gdb_test { args } {
 	    perror "\"$command\" is not a unique command name."
             fail "$message"
 	    set result 1
-	}
-	 -re "\[\r\n\]*($pattern)\[\r\n\]+$mi_gdb_prompt\[ \]*$" {
-	    if ![string match "" $message] then {
-		pass "$message"
-	    }
-	    set result 0
 	}
 	 -re "Program exited with code \[0-9\]+.*$mi_gdb_prompt\[ \]*$" {
 	    if ![string match "" $message] then {