aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2004-05-21 17:27:01 +0000
committerJoel Brobecker <brobecker@gnat.com>2004-05-21 17:27:01 +0000
commit734b8fe8d4618b0e7bf87d3f9371c6805b95551d (patch)
tree3ad54043287128c55018e35ece8dc3af1a2748fe
parent9aa3914d5c0b5791979c8ffb6eec51745940163e (diff)
downloadgdb-734b8fe8d4618b0e7bf87d3f9371c6805b95551d.zip
gdb-734b8fe8d4618b0e7bf87d3f9371c6805b95551d.tar.gz
gdb-734b8fe8d4618b0e7bf87d3f9371c6805b95551d.tar.bz2
* lib/gdb.exp (gdb_test_multiple): Improve regexp matching the
GDB prompt.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/lib/gdb.exp2
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8a82c33..19a0aa3 100644
--- 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 f49cbbf..32f36d1 100644
--- 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"
}