* lib/gdb.exp (gdb_test_multiple): Improve regexp matching the

        GDB prompt.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8a82c339ba2031a9bb5935b46271744e6efd3634..19a0aa361eace4c2d9ba05320fcfc72eb67c0f79 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-21  Joel Brobecker  <brobecker@gnat.com>
+            Daniel Jacobowitz  <drow@mvista.com>
+
+       * lib/gdb.exp (gdb_test_multiple): Improve regexp matching the
+       GDB prompt.
+
 2004-05-20  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * gdb.base/signull.c: Use sigsetjmp/siglongjmp instead of 

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index f49cbbf9855448554a4ad43f6e3af219fad2a381..32f36d16f46aea6a4f55b84fe1b35082a12c601a 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -661,7 +661,7 @@ proc gdb_test_multiple { command message user_code } {
            fail "$errmsg"
            set result -1
        }
-        -re ".*$gdb_prompt $" {
+        -re "\r\n$gdb_prompt $" {
            if ![string match "" $message] then {
                fail "$message"
            }