diff options
Diffstat (limited to 'gdb/testsuite/config/monitor.exp')
| -rw-r--r-- | gdb/testsuite/config/monitor.exp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp index be98f1aa96d..ca11600e2b7 100644 --- a/gdb/testsuite/config/monitor.exp +++ b/gdb/testsuite/config/monitor.exp @@ -226,6 +226,12 @@ proc gdb_load { arg } { set loadtimeout 1600 } + if [is_remote target] { + set oldremotetimeout [get_remotetimeout] + set_remotetimeout $loadtimeout + } + + set load_ok 0 send_gdb $command; gdb_expect $loadtimeout { -re "\[Ff\]ailed.*$gdb_prompt $" { @@ -235,7 +241,7 @@ proc gdb_load { arg } { } -re "$gdb_prompt $" { verbose "Loaded $farg into $GDB\n" - return 0; + set load_ok 1 } timeout { if { $verbose > 1 } { @@ -243,6 +249,14 @@ proc gdb_load { arg } { } } } + + if [is_remote target] { + set_remotetimeout $oldremotetimeout + } + + if { $load_ok == 1 } { + return 0; + } } # Make sure we don't have an open connection to the target. |