* config/unix.exp: Add ability to set test timeout from site.exp.

	* doc/user.xml: Document new test_timeout variable in site.exp.
	* doc/dejagnu.texi: Regenerate.

Signed-off-by: Ben Elliston <bje@gnu.org>

4 files changed, 25 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a078d5..7e39e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-16  Brooks Moses  <bmoses@google.com>
+
+	* config/unix.exp: Add ability to set test timeout from site.exp.
+	* doc/user.xml: Document new test_timeout variable in site.exp.
+	* doc/dejagnu.texi: Regenerate.
+
 2015-11-16  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/runtest.all/options.exp: Re-enable --strace 1 test.
diff --git a/config/unix.exp b/config/unix.exp
index 4b244ca..c9d80dc 100644
--- a/config/unix.exp
+++ b/config/unix.exp
@@ -35,9 +35,14 @@ load_lib remote.exp
 
 proc unix_load { dest prog args } {
     global ld_library_path
+    global test_timeout
     set output ""
     set orig_ld_library_path ""
 
+    if {![info exists test_timeout]} {
+	set test_timeout 300
+    }
+
     if { [llength $args] > 0 } {
 	set parg [lindex $args 0]
     } else {
@@ -72,13 +77,14 @@ proc unix_load { dest prog args } {
 	setenv LD_LIBRARY_PATH "$ld_library_path:$orig_ld_library_path"
 	setenv SHLIB_PATH "$ld_library_path:$orig_ld_library_path"
 	verbose -log "Setting LD_LIBRARY_PATH to $ld_library_path:$orig_ld_library_path" 2
+	verbose -log "Execution timeout is: $test_timeout" 2
 
 	set id [remote_spawn $dest "$command" "readonly"]
 	if { $id < 0 } {
 	    set output "remote_spawn failed"
 	    set status -1
 	} else {
-	    set status [remote_wait $dest 300]
+	    set status [remote_wait $dest $test_timeout]
 	    set output [lindex $status 1]
 	    set status [lindex $status 0]
 	}
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index b2c6e5a..c679b6c 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -2100,6 +2100,12 @@ the GCC testsuite. For most test cases, the CXXFLAGS and LDFLAGS
 are supplied by DejaGnu itself for cross testing, but to test a
 compiler, GCC needs to manipulate these itself.
 
+The local @file{site.exp} may also set Tcl
+variables such as @code{test_timeout} which can control
+the amount of time (in seconds) to wait for a remote test to
+complete. If not specified, @code{test_timeout} defaults
+to 300 seconds.
+
 @node Global Config File, Board Config File, Local Config File, Customizing DejaGnu
 @section Global Config File
 
diff --git a/doc/user.xml b/doc/user.xml
index 07bb7a3..5edfaab 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -1673,6 +1673,12 @@ powerpc-linux-gcc -g -O2 -o calc calc.o
     are supplied by &dj; itself for cross testing, but to test a
     compiler, GCC needs to manipulate these itself.</para>
 
+    <para>The local <filename>site.exp</filename> may also set Tcl
+    variables such as <symbol>test_timeout</symbol> which can control
+    the amount of time (in seconds) to wait for a remote test to
+    complete. If not specified, <symbol>test_timeout</symbol> defaults
+    to 300 seconds.</para>
+
     </sect2>
      <sect2 id="global" xreflabel="Global Config File">
       <title>Global Config File</title>