Fix races in mi2-return.exp.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3b84b69..8d07e4a 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,15 +1,19 @@
 2011-06-23  Marek Polacek  <mpolacek@redhat.com>
 
-        * gdb.mi/mi2-console.exp: Replace gdb_test_multiple with mi_gdb_test.
+       * gdb.mi/mi2-return.exp: Replace gdb_test_multiple with mi_gdb_test.
 
 2011-06-23  Marek Polacek  <mpolacek@redhat.com>
 
-        * gdb.mi/mi2-basics.exp: Fix races.  Honour the
-        `test_exec_and_symbol_mi_operatons' return value.
-        (test_mi_interpreter_selection): Use mi_gdb_test instead of
-        gdb_test_multiple.
-        (test_exec_and_symbol_mi_operatons): Likewise.
-        (test_path_specification): Likewise.
+       * gdb.mi/mi2-console.exp: Replace gdb_test_multiple with mi_gdb_test.
+
+2011-06-23  Marek Polacek  <mpolacek@redhat.com>
+
+       * gdb.mi/mi2-basics.exp: Fix races.  Honour the
+       `test_exec_and_symbol_mi_operatons' return value.
+       (test_mi_interpreter_selection): Use mi_gdb_test instead of
+       gdb_test_multiple.
+       (test_exec_and_symbol_mi_operatons): Likewise.
+       (test_path_specification): Likewise.
 
 2011-06-23  Yao Qi  <yao@codesourcery.com>
 
@@ -23,21 +27,21 @@
 
 2011-06-21  Marek Polacek  <mpolacek@redhat.com>
 
-        * gdb.mi/mi-var-display.exp: Replace gdb_test_multiple with
+       * gdb.mi/mi-var-display.exp: Replace gdb_test_multiple with
        mi_gdb_test.
 
 2011-06-20  Marek Polacek  <mpolacek@redhat.com>
 
-        * gdb.mi/mi-nsintrall.exp: Replace gdb_test_multiple with mi_gdb_test.
+       * gdb.mi/mi-nsintrall.exp: Replace gdb_test_multiple with mi_gdb_test.
 
 2011-06-20  Marek Polacek  <mpolacek@redhat.com>
 
-        * gdb.mi/mi-nsmoribund.exp: Replace gdb_test_multiple with
+       * gdb.mi/mi-nsmoribund.exp: Replace gdb_test_multiple with
        mi_gdb_test.
 
 2011-06-20  Marek Polacek  <mpolacek@redhat.com>
 
-        * gdb.mi/mi-return.exp: Replace gdb_test_multiple with mi_gdb_test.
+       * gdb.mi/mi-return.exp: Replace gdb_test_multiple with mi_gdb_test.
 
 2011-06-14  Yao Qi  <yao@codesourcery.com>
 

diff --git a/gdb/testsuite/gdb.mi/mi2-return.exp b/gdb/testsuite/gdb.mi/mi2-return.exp
index f0826c4..c2940df 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-return.exp
+++ b/gdb/testsuite/gdb.mi/mi2-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