* mi-cli.exp: Use mi_run_to_main to get to main. Don't use "run".

        Refine result string for "-interpreter-exec console bougs" test.

diff --git a/gdb/testsuite/gdb.mi/ChangeLog b/gdb/testsuite/gdb.mi/ChangeLog
index eec91e5277b256af8e38d7d10afe6e43c034853b..7f02cd8fee6198b575b155f5d64234956122491f 100644 (file)
--- a/gdb/testsuite/gdb.mi/ChangeLog
+++ b/gdb/testsuite/gdb.mi/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-22  Keith Seitz  <keiths@redhat.com>
+
+       * mi-cli.exp: Use mi_run_to_main to get to main. Don't use "run".
+       Refine result string for "-interpreter-exec console bougs" test.
+       
 2002-06-25  Keith Seitz  <keiths@redhat.com>
 
        * mi-cli.exp: Add tests to check if list_command in the console

diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index 0f93bd24880ae4c52b04e96c44aed9afb056ba2e..95ab9a5583c3d6da9b1769ac5c3db3d6185a8dc1 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -53,8 +53,9 @@ mi_gdb_test "-interpreter-exec bogus command" \
   {\^error,msg="mi_cmd_interpreter_exec: could not find interpreter \\\"bogus\\\""} \
   "-interpreter-exec with bogus interpreter"
 
+set msg {Undefined command: \\\"bogus\\\"\.  Try \\\"help\\\"\.}
 mi_gdb_test "-interpreter-exec console bogus" \
-  {\^error,msg="Undefined command: \"bogus\".  Try \"help\"\."} \
+    "&\\\"$msg\\\\n\\\".*\\^error,msg=\\\"$msg\\\".*" \
   "-interpreter-exec console bogus"
 
 mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
@@ -77,10 +78,7 @@ mi_gdb_test "-interpreter-exec console \"info break\"" \
   {\~"Num[ \t]*Type[ \t]*Disp[ \t]*Enb[ \t]*Address[ \t]*What\\n".*~"1[ \t]*breakpoint[ \t]*keep[ \t]*y[ \t]*0x[0-9A-Fa-f]+[ \t]*in main at .*basics.c:[0-9]+\\n".*\^done} \
   "-interpreter-exec console \"info break\""
 
-# FIXME: Is this right? This doesn't work right now anyway...
-mi_gdb_test "-interpreter-exec console run" \
-  {\^running.*(=.*)*\*stopped,reason="breakpoint-hit",.*\^done} \
-  "-interpreter-exec console run"
+mi_run_to_main
 
 mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \
   {\^done} \