summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Seitz <keiths@redhat.com>2002-09-04 21:05:07 +0000
committerKeith Seitz <keiths@redhat.com>2002-09-04 21:05:07 +0000
commit8fb10273610caf3bed0820276ae6c0ec98f6196e (patch)
tree411f6899987ac11ae6638667c0aa583848e40516
parent8cb409109e46edf0b5957eb76deaef14ef2e1b06 (diff)
downloadgdb-8fb10273610caf3bed0820276ae6c0ec98f6196e.tar.gz
* lib/mi-support.exp: Update copyright.
(mi_gdb_test): Increase the priority of the expected pattern so that it matches gdb_test.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/lib/mi-support.exp14
2 files changed, 13 insertions, 7 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d0f9ef281c3..7f3f2bf5fb7 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 d3861e14618..451dceaf60c 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
@@ -471,6 +471,12 @@ proc mi_gdb_test { args } {
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";
exp_continue;
@@ -485,12 +491,6 @@ proc mi_gdb_test { args } {
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 {
set errmsg "$message: the program exited"