diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/config/sim.exp | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3935ee6..66310d7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-12-05 Andrew Burgess <andrew.burgess@embecosm.com> + + * config/sim.exp (gdb_target_sim): Remove redundant adjustment of + local timeout variable before return, and remove all local timeout + variable entirely. + (gdb_load): Likewise. + 2018-12-01 Tom de Vries <tdevries@suse.de> * gdb.base/gdb-caching-proc.exp: New file. diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp index d9072fe..fd4d506 100644 --- a/gdb/testsuite/config/sim.exp +++ b/gdb/testsuite/config/sim.exp @@ -26,9 +26,7 @@ proc gdb_target_sim { } { set target_sim_options "[board_info target gdb,target_sim_options]" send_gdb "target sim $target_sim_options\n" - set timeout 60 - verbose "Timeout is now $timeout seconds" 2 - gdb_expect { + gdb_expect 60 { -re "Connected to the simulator.*$gdb_prompt $" { verbose "Set target to sim" } @@ -37,8 +35,6 @@ proc gdb_target_sim { } { return -1 } } - set timeout 10 - verbose "Timeout is now $timeout seconds" 2 return 0 } @@ -60,15 +56,11 @@ proc gdb_load { arg } { if [gdb_target_sim] then { return -1 } send_gdb "load\n" - set timeout 2400 - verbose "Timeout is now $timeout seconds" 2 - gdb_expect { + gdb_expect 2400 { -re ".*$gdb_prompt $" { if $verbose>1 then { send_user "Loaded $arg into $GDB\n" } - set timeout 30 - verbose "Timeout is now $timeout seconds" 2 return 0 } -re "$gdb_prompt $" { |