10 files changed, 29 insertions, 16 deletions
diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index add3fa3..c488449 100644
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -96,8 +96,8 @@ mi_gdb_test "-interpreter-exec console \"list\"" \
   ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
   "-interpreter-exec console \"list\""
 
-mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" "" \
-    "continue to callee4"
+mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" \
+    { "" "disp=\"keep\"" } "continue to callee4"
 
 # NOTE: cagney/2003-02-03: Not yet.
 # mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
@@ -147,7 +147,8 @@ mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
 	{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
 	"-break-insert -t basics.c:\$line_main_hello"
 
-mi_execute_to "exec-continue" "" "main" "" ".*basics.c" $line_main_hello "" \
+mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \
+    $line_main_hello { "" "disp=\"del\"" } \
     "-exec-continue to line $line_main_hello"
 
 mi_execute_to "exec-next" "end-stepping-range" "main" "" ".*basics.c" $line_main_return "" \
diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 01fd934..f2e6b95 100644
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -68,5 +68,6 @@ mi_gdb_test "-break-insert -f pendfunc1" \
     "MI pending breakpoint on pendfunc1"
 
 mi_run_cmd
-mi_expect_stop "breakpoint-hit" "pendfunc1" ".*" ".*" ".*" "" \
-    "Run till MI pending breakpoint on pendfunc1"
-\ No newline at end of file
+mi_expect_stop "breakpoint-hit" "pendfunc1" ".*" ".*" ".*" \
+    { "" "disp=\"keep\"" } \
+    "Run till MI pending breakpoint on pendfunc1"
diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index c4e550f..f2edfca 100644
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -113,7 +113,8 @@ proc test_running_the_program {} {
     # two prompts involved and this can lead to a race condition.
     # The following is equivalent to a send_gdb "000-exec-run\n"
     mi_run_cmd
-    mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" "" "run to main"
+    mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" \
+      { "" "disp=\"keep\"" } "run to main"
 }
 
 proc test_controlled_execution {} {
diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
index 1ea9acb..dbdd1c1 100644
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ b/gdb/testsuite/gdb.mi/mi-until.exp
@@ -55,7 +55,8 @@ proc test_running_to_foo {} {
              "break-insert operation"
 
     mi_run_cmd
-    mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 "" "run to main"
+    mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 \
+      { "" "disp=\"keep\"" } "run to main"
 
     mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1"
 
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index c1ae813..27331ce 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -581,7 +581,8 @@ mi_run_inline_test floating
 set do_at_tests_callee_breakpoint [gdb_get_line_number "breakpoint inside callee"]
 mi_gdb_test "-break-insert var-cmd.c:$do_at_tests_callee_breakpoint" ".*" \
     "inside breakpoint inside callee"
-mi_execute_to "exec-continue" "breakpoint-hit" do_at_tests_callee "" ".*" ".*" ""\
+mi_execute_to "exec-continue" "breakpoint-hit" do_at_tests_callee "" ".*" ".*" \
+    { "" "disp=\"keep\"" } \
     "continue to where i is initialized"
 
 mi_varobj_update F {F} "update F inside callee"
diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index 22ad34d..1d1fd8a 100644
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -47,7 +47,8 @@ mi_gdb_test "200-break-insert $srcfile:$line_dct_end" \
 	"break-insert operation"
 
 mi_run_cmd
-mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" $line_dct_end "" "run to main"
+mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" \
+	$line_dct_end { "" "disp=\"keep\"" } "run to main"
 
 #####       #####
 #               #
@@ -374,7 +375,8 @@ mi_gdb_test "200-break-insert $line_dst_incr_a_2" \
 	"200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_incr_a_2\",times=\"0\"\}" \
 	"break-insert operation"
 
-mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" ".*var-cmd.c" $line_dst_incr_a_2 "" \
+mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" \
+    ".*var-cmd.c" $line_dst_incr_a_2 { "" "disp=\"keep\"" } \
     "continue to do_special_tests"
 
 # Test: c_variable-7.10
diff --git a/gdb/testsuite/gdb.mi/mi2-cli.exp b/gdb/testsuite/gdb.mi/mi2-cli.exp
index 5c993f8..d9e3467 100644
--- a/gdb/testsuite/gdb.mi/mi2-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli.exp
@@ -96,7 +96,8 @@ mi_gdb_test "-interpreter-exec console \"list\"" \
   ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
   "-interpreter-exec console \"list\""
 
-mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" "" \
+mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" \
+    { "" "disp=\"keep\"" } \
     "continue to callee4"
 
 # NOTE: cagney/2003-02-03: Not yet.
@@ -147,7 +148,8 @@ mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
 	{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
 	"-break-insert -t basics.c:\$line_main_hello"
 
-mi_execute_to "exec-continue" "" "main" "" ".*basics.c" $line_main_hello "" \
+mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \
+    $line_main_hello { "" "disp=\"del\"" } \
     "-exec-continue to line $line_main_hello"
 
 mi_execute_to "exec-next" "end-stepping-range" "main" "" ".*basics.c" $line_main_return "" \
diff --git a/gdb/testsuite/gdb.mi/mi2-simplerun.exp b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
index 66ad03a..3f0a1aa 100644
--- a/gdb/testsuite/gdb.mi/mi2-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
@@ -113,7 +113,8 @@ proc test_running_the_program {} {
     # two prompts involved and this can lead to a race condition.
     # The following is equivalent to a send_gdb "000-exec-run\n"
     mi_run_cmd
-    mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" "" "run to main"
+    mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" \
+	{"" "disp=\"keep\"" } "run to main"
 }
 
 proc test_controlled_execution {} {
diff --git a/gdb/testsuite/gdb.mi/mi2-until.exp b/gdb/testsuite/gdb.mi/mi2-until.exp
index 5bf9bd8..a6da82a 100644
--- a/gdb/testsuite/gdb.mi/mi2-until.exp
+++ b/gdb/testsuite/gdb.mi/mi2-until.exp
@@ -56,7 +56,8 @@ proc test_running_to_foo {} {
              "break-insert operation"
 
     mi_run_cmd
-    mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 "" "run to main"
+    mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 \
+	{ "" "disp=\"keep\"" } "run to main"
 
     mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1"
 
diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp
index 00e5a85..60d0d78 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp
@@ -47,7 +47,8 @@ mi_gdb_test "200-break-insert $srcfile:$line_dct_end" \
 	"break-insert operation"
 
 mi_run_cmd
-mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" $line_dct_end "" "run to main"
+mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" \
+	$line_dct_end { "" "disp=\"keep\"" } "run to main"
 
 #####       #####
 #               #
@@ -373,7 +374,8 @@ mi_gdb_test "200-break-insert $line_dst_incr_a_2" \
 	"200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_incr_a_2\",times=\"0\"\}" \
 	"break-insert operation"
 
-mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" ".*var-cmd.c" $line_dst_incr_a_2 "" \
+mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" \
+    ".*var-cmd.c" $line_dst_incr_a_2 { "" "disp=\"keep\"" } \
     "continue to do_special_tests"
 
 # Test: c_variable-7.10