diff options
Diffstat (limited to 'gdb/testsuite/lib/mi-support.exp')
| -rw-r--r-- | gdb/testsuite/lib/mi-support.exp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 4b057d49623..f7eb2652e4f 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -127,22 +127,22 @@ proc mi_gdb_start { } { # We have a new format mi startup prompt. If we are # running mi1, then this is an error as we should be # using the old-style prompt. - if { $MIFLAGS == "-i=mi1" } { - perror "(mi startup) Got unexpected new mi prompt." - remote_close host; - return -1; - } +# if { $MIFLAGS == "-i=mi1" } { +# perror "(mi startup) Got unexpected new mi prompt." +# remote_close host; +# return -1; +# } verbose "GDB initialized." } -re "\[^~\].*$mi_gdb_prompt$" { # We have an old format mi startup prompt. If we are # not running mi1, then this is an error as we should be # using the new-style prompt. - if { $MIFLAGS != "-i=mi1" } { - perror "(mi startup) Got unexpected old mi prompt." - remote_close host; - return -1; - } +# if { $MIFLAGS != "-i=mi1" } { +# perror "(mi startup) Got unexpected old mi prompt." +# remote_close host; +# return -1; +# } verbose "GDB initialized." } -re ".*$gdb_prompt $" { @@ -209,7 +209,7 @@ proc mi_delete_breakpoints {} { send_gdb "y\n"; exp_continue } - -re ".*102-break-delete\r\n102\\\^done\r\n$mi_gdb_prompt$" { + -re ".*102-break-delete\r\n(=.*)*102\\\^done\r\n$mi_gdb_prompt$" { # This happens if there were no breakpoints } timeout { perror "Delete all breakpoints in mi_delete_breakpoints (timeout)" ; return } @@ -711,7 +711,7 @@ proc mi_runto {func} { set test "mi runto $func" mi_gdb_test "200-break-insert $func" \ - "200\\^done,bkpt=\{number=\"\[0-9\]+\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"$func\",file=\".*\",line=\"\[0-9\]*\",times=\"0\"\}" \ + "\(=breakpoint-create,number=\"\[0-9\]+\")\r\n200\\^done" \ "breakpoint at $func" if {![regexp {number="[0-9]+"} $expect_out(buffer) str] |