diff options
Diffstat (limited to 'gdb/testsuite/lib')
| -rw-r--r-- | gdb/testsuite/lib/mi-support.exp | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 3d55609..881e16e 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -765,20 +765,35 @@ proc mi_gdb_test { args } { if { $result == 0 } { if [ info exists ipattern ] { if { ![target_info exists gdb,noinferiorio] } { - global mi_inferior_spawn_id - expect { - -i $mi_inferior_spawn_id -re "$ipattern" { - pass "$message inferior output" + if { [target_info gdb_protocol] == "remote" + || [target_info gdb_protocol] == "extended-remote" + || [target_info protocol] == "sim"} { + + gdb_expect { + -re "$ipattern" { + pass "$message inferior output" + } + timeout { + fail "$message inferior output (timeout)" + set result 1 + } } - timeout { - fail "$message inferior output (timeout)" - set result 1 + } else { + global mi_inferior_spawn_id + expect { + -i $mi_inferior_spawn_id -re "$ipattern" { + pass "$message inferior output" + } + timeout { + fail "$message inferior output (timeout)" + set result 1 + } } } } else { unsupported "$message inferior output" } - } + } } return $result |