aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorMarek Polacek <mpolacek@sourceware.org>2011-06-22 15:32:16 +0000
committerMarek Polacek <mpolacek@sourceware.org>2011-06-22 15:32:16 +0000
commit79aa92c12491bf202580f274011546a6926d6615 (patch)
tree08aa4ec8a0e168422f7cd4340cd53e7214b64bee /gdb
parentf8b999f94554f44229f48a6c93fc14e715871091 (diff)
downloadgdb-79aa92c12491bf202580f274011546a6926d6615.zip
gdb-79aa92c12491bf202580f274011546a6926d6615.tar.gz
gdb-79aa92c12491bf202580f274011546a6926d6615.tar.bz2
Fix races in gdb.mi/mi-return.exp.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.mi/mi-return.exp6
2 files changed, 5 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b4e0dea..70ea0cd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-20 Marek Polacek <mpolacek@redhat.com>
+
+ * gdb.mi/mi-return.exp: Replace gdb_test_multiple with mi_gdb_test.
+
2011-06-14 Yao Qi <yao@codesourcery.com>
gdb/testsuite/
diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
index e6a1fc30..633888c 100644
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -53,11 +53,7 @@ proc test_return_simple {} {
set line_callee3_call [expr $line_callee3_head + 2]
set line_callee3_close_brace [expr $line_callee3_head + 3]
- gdb_test_multiple "111-exec-return" "return from callee4 now" {
- -re "111\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"($line_callee3_call|$line_callee3_close_brace)\"\}\r\n$mi_gdb_prompt$" {
- pass "return from callee4 now"
- }
- }
+ mi_gdb_test "111-exec-return" "111\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"($line_callee3_call|$line_callee3_close_brace)\"\}" "return from callee4 now"
}
mi_runto callee4