2011-05-20 Pedro Alves <pedro@codesourcery.com>

	Cope with async mode.

	gdb/testsuite/
	* gdb.mi/mi-break.exp (test_breakpoint_commands): Split gdb_test
	into gdb_test + mi_expect_stop.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index df51d61..c043204 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-20  Pedro Alves  <pedro@codesourcery.com>
 
+       Cope with async mode.
+
+       gdb/testsuite/
+       * gdb.mi/mi-break.exp (test_breakpoint_commands): Split gdb_test
+       into gdb_test + mi_expect_stop.
+
+2011-05-20  Pedro Alves  <pedro@codesourcery.com>
+
        * gdb.mi/basics.c: Don't include stdio.h or unistd.h.
        (callme): Remove printf call.
 

diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp
index b7977b7..969cf4c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -232,10 +232,19 @@ proc test_breakpoint_commands {} {
         "\\^done" \
         "breakpoint commands: set commands"
 
-    mi_send_resuming_command "exec-continue" "test hitting breakpoint with commands"
-    mi_gdb_test "" \
-        ".*\\\$1 = 0.*\\\$10 = 9.*\\*running.*\\*stopped,reason=\"exited-normally\".*" \
-        "test hitting breakpoint with commands"
+    mi_send_resuming_command "exec-continue" "breakpoint commands: continue"
+
+    set test "intermediate stop and continue"
+    gdb_expect {
+        -re ".*\\\$1 = 0.*\\\$10 = 9.*\\*running" {
+           pass $test
+       }
+        timeout {
+           fail $test
+        }
+    }
+
+    mi_expect_stop "exited-normally" "" "" "" "" "" "test hitting breakpoint with commands"
 }
 
 test_tbreak_creation_and_listing