Fix races in gdb.mi/mi-return.exp.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b4e0deaf9cfdae6bc2082cac3121ba07ce5eaa08..70ea0cd50e753bc9d52ebc2a543d7213f6490d50 100644 (file)
--- 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 e6a1fc3076e060ba7610aa62dcfb116c130ff0cf..633888c3a1af84f6c5c1f5ded7bf20b1e1853567 100644 (file)
--- 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