* lib/mi-support.exp: Update copyright.

        (mi_gdb_test): Increase the priority of the expected pattern
        so that it matches gdb_test.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d0f9ef281c3d863a9b8eaf9bd5a44560218c0df4..7f3f2bf5fb7281284a1638d9f1359fe48cd97f72 100644 (file)
--- 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 d3861e14618c445f0b86674326cf08121c1e9e52..451dceaf60cfc3650dcbb6ac8cccbbd5f88ebf47 100644 (file)
--- 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 {