Fix races in mi2-console.exp.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1aabd7c..3b84b69 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-23  Marek Polacek  <mpolacek@redhat.com>
 
+        * 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

diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
index 0d05256..29a4422 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-console.exp
+++ b/gdb/testsuite/gdb.mi/mi2-console.exp
@@ -48,11 +48,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 mi_run_to_main
 
 # Next over the hello() call which will produce lots of output
-gdb_test_multiple "220-exec-next" "Started step over hello" {
-    -re "220\\^running\r\n(\\*running,thread-id=\"all\"\r\n)?$mi_gdb_prompt" {
-       pass "Started step over hello"
-    }
-}
+mi_gdb_test "220-exec-next" "220\\^running(\r\n)?(\\*running,thread-id=\"all\")?" \
+       "Started step over hello"
 
 if { ![target_info exists gdb,noinferiorio] } {
     gdb_expect {