diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-03-05 07:58:54 +1100 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2016-03-05 07:58:54 +1100 |
| commit | 6aa75b1c0c5f2de57775860ece1b066beb906f59 (patch) | |
| tree | e5d2bcc2db3639c4b7a6d7eaba268e24df9508ad | |
| parent | 4839bf70660f93275b8ad108fd5dbb82a60c6e9d (diff) | |
| download | dejagnu-6aa75b1c0c5f2de57775860ece1b066beb906f59.zip dejagnu-6aa75b1c0c5f2de57775860ece1b066beb906f59.tar.gz dejagnu-6aa75b1c0c5f2de57775860ece1b066beb906f59.tar.bz2 | |
* lib/remote.exp (remote_exec): Restore original timeout value.
Signed-off-by: Ben Elliston <bje@gnu.org>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/remote.exp | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2016-03-05 Yvan Roux <yvan.roux@linaro.org> + + * lib/remote.exp (remote_exec): Restore original timeout value. + 2016-03-04 Yvan Roux <yvan.roux@linaro.org> * lib/remote.exp (standard_upload): Remove dead code. diff --git a/lib/remote.exp b/lib/remote.exp index 7b2f1ab..887867c 100644 --- a/lib/remote.exp +++ b/lib/remote.exp @@ -310,13 +310,14 @@ proc remote_exec { hostname program args } { # Run it locally if appropriate. if { ![is_remote $hostname] } { - return [local_exec "$program $pargs" $inp $outp $timeout] + set result [local_exec "$program $pargs" $inp $outp $timeout] } else { - return [call_remote "" exec $hostname $program $pargs $inp $outp] + set result [call_remote "" exec $hostname $program $pargs $inp $outp] } # Restore timeout. set timeout $old_timeout + return $result } proc standard_exec { hostname args } { |