diff options
| author | Tom Tromey <tom@tromey.com> | 2022-08-10 14:42:22 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2022-12-19 07:47:37 -0700 |
| commit | 975249ff4e260453217f4a98b1033b0c7a6e6dc5 (patch) | |
| tree | bee0f6f082ee6dc4c277683b1bbde7800b9e2a4d /gdb/testsuite | |
| parent | d1c34a1b4c4ee82744f7f8215b23706c329b63e6 (diff) | |
| download | gdb-975249ff4e260453217f4a98b1033b0c7a6e6dc5.zip gdb-975249ff4e260453217f4a98b1033b0c7a6e6dc5.tar.gz gdb-975249ff4e260453217f4a98b1033b0c7a6e6dc5.tar.bz2 | |
Remove MI version 1
MI version 1 is long since obsolete. Several years ago, I filed
PR mi/23170 for this. I think it's finally time to remove this.
Any users of MI 1 can and should upgrade to a newer version.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=23170
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/gdb.base/interp.exp | 9 | ||||
| -rw-r--r-- | gdb/testsuite/lib/mi-support.exp | 46 |
2 files changed, 5 insertions, 50 deletions
diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp index a42d4ae..a77dace 100644 --- a/gdb/testsuite/gdb.base/interp.exp +++ b/gdb/testsuite/gdb.base/interp.exp @@ -52,15 +52,6 @@ gdb_test_multiple "interpreter-exec mi \"-stack-info-frame\"" "" { } } -gdb_test_multiple "interpreter-exec mi1 \"-break-insert main\"" "" { - -re ".done.bkpt=.number=.\[0-9\]\[^\n\]+\r\n$gdb_prompt " { - pass $gdb_test_name - gdb_expect 1 { - -re "\r\n$gdb_prompt $" { } - } - } -} - gdb_test_multiple "interpreter-exec mi2 \"-break-insert main\"" "" { -re ".done.bkpt=.number=.\[0-9\]\[^\n\]+\r\n$gdb_prompt " { pass $gdb_test_name diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 573a9b9..0249cb7 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -264,27 +264,7 @@ proc default_mi_gdb_start { { flags {} } } { gdb_expect { -re "~\"GNU.*\r\n~\".*$mi_gdb_prompt$" { - # 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 - unset gdb_spawn_id - 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 - unset gdb_spawn_id - return -1 - } + # We have a new format mi startup prompt. verbose "GDB initialized." } -re ".*unrecognized option.*for a complete list of options." { @@ -399,27 +379,11 @@ proc mi_gdb_reinitialize_dir { subdir } { return "" } - if { $MIFLAGS == "-i=mi1" } { - send_gdb "104-environment-directory\n" - gdb_expect 60 { - -re ".*Reinitialize source path to empty.*y or n. " { - warning "Got confirmation prompt for dir reinitialization." - send_gdb "y\n" - gdb_expect 60 { - -re "$mi_gdb_prompt$" {} - timeout {error "Dir reinitialization failed (timeout)"} - } - } + send_gdb "104-environment-directory -r\n" + gdb_expect 60 { + -re "104\\\^done,source-path=.*\r\n$mi_gdb_prompt$" {} -re "$mi_gdb_prompt$" {} - timeout {error "Dir reinitialization failed (timeout)"} - } - } else { - send_gdb "104-environment-directory -r\n" - gdb_expect 60 { - -re "104\\\^done,source-path=.*\r\n$mi_gdb_prompt$" {} - -re "$mi_gdb_prompt$" {} - timeout {error "Dir reinitialization failed (timeout)"} - } + timeout {error "Dir reinitialization failed (timeout)"} } send_gdb "105-environment-directory $subdir\n" |