From 73db65f5379532d038cb65b45c56f8d8f765286a Mon Sep 17 00:00:00 2001 From: Brooks Moses Date: Fri, 20 Nov 2015 09:21:04 +1100 Subject: * 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 --- config/unix.exp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'config') 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] } -- cgit v1.1