* lib/mi-support.exp (mi_expect_stop): New.

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.mi / mi2-console.exp

diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
index 92d13c11834f98093ccf6ee1b08dad60aca0afdc..88b4fdd3795ff58b2cf433251add82c63d5ce3f5 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-console.exp
+++ b/gdb/testsuite/gdb.mi/mi2-console.exp
@@ -51,9 +51,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 mi_run_to_main
 
 # Next over the hello() call which will produce lots of output
-send_gdb "47-exec-next\n"
+send_gdb "220-exec-next\n"
 gdb_expect {
-    -re "47\\^running\r\n$mi_gdb_prompt" {
+    -re "220\\^running\r\n$mi_gdb_prompt" {
        pass "Started step over hello"
     }
     timeout {
@@ -83,14 +83,8 @@ if { ![target_info exists gdb,noinferiorio] } {
     }
 }
 
-gdb_expect {
-    -re "47\\*stopped.*$mi_gdb_prompt$" {
-       pass "Finished step over hello"
-    }
-    timeout {
-       fail "Finished step over hello (timeout)"
-    }
-}
+mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" "14" "" \
+    "finished step over hello"
 
 mi_gdb_exit
 return 0