[binutils-gdb] gdb/testsuite/sim: Remove redundant setting of timeout

[Andrew Burgess <aburgess at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=13f2ed32e14311bdcdb9d6efe263486d5d128cfd

commit 13f2ed32e14311bdcdb9d6efe263486d5d128cfd
Author: Andrew Burgess <andrew.burgess@embecosm.com>
Date:   Tue Dec 4 11:29:47 2018 +0000

    gdb/testsuite/sim: Remove redundant setting of timeout
    
    In the config/sim.exp file two functions are defined.  Both of these
    functions define local timeout variables and then call gdb_expect,
    which (through a call to get_largest_timeout) will find the local
    definition of timeout.
    
    However, both of these functions set the local timeout to some
    arbitrary value and print a log message for this "new" timeout just
    before returning.
    
    As in both cases, the timeout is a local variable, this final setting
    of the timeout has no effect and can be removed.
    
    As having log messages about the timeout being adjusted could cause
    confusion I've removed all logging related to timeouts in this
    function, timeouts are adjusted throughout the testsuite without any
    logging, there doesn't seem to be any good reason why these functions
    should get their own logging.
    
    With the logging gone there seems to be little need to a local timeout
    variable at all, and so I've folded the local timeout directly into
    the call to gdb_expect.
    
    gdb/testsuite/ChangeLog:
    
    	* 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.

Diff:
---
 gdb/testsuite/ChangeLog      |  7 +++++++
 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 $"     {