Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi-stepn.exp

Index: gdb/testsuite/gdb.mi/mi-stepn.exp
diff --git a/gdb/testsuite/gdb.mi/mi-hack-cli.exp b/gdb/testsuite/gdb.mi/mi-stepn.exp
similarity index 55%
copy from gdb/testsuite/gdb.mi/mi-hack-cli.exp
copy to gdb/testsuite/gdb.mi/mi-stepn.exp
index 6e35f14dc99b2f590183a96a85409d642953a85c..4333cfe40c4e6e47579c9559c99139100e232d25 100644
--- a/gdb/testsuite/gdb.mi/mi-hack-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepn.exp
@@ -1,4 +1,4 @@
-# Copyright 1999, 2001, 2007-2012 Free Software Foundation, Inc.
+# Copyright 2011-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,8 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-# Some basic checks for the CLI.
+# Verify that when "-exec-step N" trips on a breakpoint, we get a
+# *stop event with reason breakpoint-hit.
 
 load_lib mi-support.exp
 set MIFLAGS "-i=mi"
@@ -24,13 +24,20 @@ if [mi_gdb_start] {
     continue
 }
 
-mi_gdb_test "show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n\\^done" \
-	"show architecture"
+standard_testfile
+
+set opts {debug}
+if [build_executable ${testfile}.exp ${testfile} ${srcfile} $opts] {
+    return -1
+}
+
+if {[mi_run_to_main] < 0} {
+    return -1
+}
 
-mi_gdb_test "47show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n47\\^done" \
-	"47show architecture"
+mi_create_breakpoint do_nothing 2 keep do_nothing .* .* .* \
+    "breakpoint at do_nothing"
 
-mi_gdb_exit
-return 0
+mi_send_resuming_command "exec-step 3" ""
+mi_expect_stop "breakpoint-hit" "do_nothing" "\[^\n\]*" "$srcfile" \
+    "\[0-9\]*" {"" "disp=\"keep\""} "breakpoint-hit reported"