From f720dfef59b77fdaea3dd9c6220a5dd5f46d9316 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Sun, 14 Feb 2016 23:00:09 +1100
Subject: [PATCH] 	* lib/remote.exp (remote_exec): Set global timeout for
 benefit of 	<remote>_exec.

Signed-off-by: Ben Elliston <bje@gnu.org>
---
 ChangeLog      | 5 +++++
 lib/remote.exp | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f5001cb..36f0d71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-14  Maxim Kuvyrkov  <maxim.kuvyrkov@linaro.org>
+
+	* lib/remote.exp (remote_exec): Set global timeout for benefit of
+	<remote>_exec.
+
 2016-02-14  Ben Elliston  <bje@gnu.org>
 
 	* lib/remote.exp (local_exec): Improve comments.
diff --git a/lib/remote.exp b/lib/remote.exp
index 07ad0cd..2d20a61 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -297,6 +297,10 @@ proc remote_exec { hostname program args } {
 	set outp ""
     }
 
+    # call_remote below gets its timeout from global variable, so set
+    # it here.
+    global timeout
+    set old_timeout $timeout
     # 300 is probably a lame default.
     if { [llength $args] > 3 } {
 	set timeout "[lindex $args 3]"
@@ -312,6 +316,9 @@ proc remote_exec { hostname program args } {
     } else {
 	return [call_remote "" exec $hostname $program $pargs $inp $outp]
     }
+
+    # Restore timeout.
+    set timeout $old_timeout
 }
 
 proc standard_exec { hostname args } {
-- 
2.7.4