* lib/mi-support.exp (mi_step_next_helper): Remove.

        (mi_next): Use mi_next_to.
        (mi_step): Use mi_step_to.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 15ae005dab8263fd6144d017349023a5f0fd82ad..c2b5820bf763990cbb778567b87b3b4b6f9832a9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-11  Keith Seitz  <keiths@redhat.com>
+
+       * lib/mi-support.exp (mi_step_next_helper): Remove.
+       (mi_next): Use mi_next_to.
+       (mi_step): Use mi_step_to.
+
 2002-09-05  Keith Seitz  <keiths@redhat.com>
 
        * lib/mi-support.exp (mi_runto): New proc. Does the same as gdb's

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 770ee3887e1b95b659df75475a65f4e3b5516d35..a8ccd953441a8e6333a7587673e3f20a2166af18 100644 (file)
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -686,45 +686,19 @@ proc mi_runto {func} {
 }
 
 
-# Helper function for mi_next and mi_step
-# CMD is either "step" or "next"
-# TEST is the name of the test (passed to dejagnu's pass/fail)
-# Returns:
-#     0  if passed
-#     1  if failed/timeout
-proc mi_step_next_helper {cmd test} {
-  global suppress_flag
-  if { $suppress_flag } {
-    return 1
-  }
-
-  global mi_gdb_prompt decimal hex
-  send_gdb "220-exec-$cmd\n"
-  gdb_expect {
-    -re ".*220\\^running\r\n$mi_gdb_prompt.*220\\*stopped,reason=\"end-stepping-range\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\(\\\[.*\\\]\|\{.*\}\),file=\".*\",line=\"$decimal\"\}\r\n$mi_gdb_prompt$" {
-      pass "$test"
-      return 0
-    }
-    timeout {
-      fail "$test"
-      return 1
-    }
-  }
-}
-
 # Next to the next statement
-# For return values, see mi_step_next_helper
+# For return values, see mi_run_to_helper
 
 proc mi_next { test } {
-  return [mi_step_next_helper next $test]
+  return [mi_next_to {.*} {.*} {.*} {.*} $test]
 }
 
 
 # Step to the next statement
-# For return values, see mi_step_next_helper
+# For return values, see mi_run_to_helper
 
 proc mi_step { test } {
-  return [mi_step_next_helper step $test]
+  return [mi_step_to {.*} {.*} {.*} {.*} $test]
 }
 
 # cmd should not include the number or newline (i.e. "exec-step 3", not