diff options
| author | Brooks Moses <bmoses@google.com> | 2015-11-20 09:21:04 +1100 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2015-11-20 09:21:04 +1100 |
| commit | 73db65f5379532d038cb65b45c56f8d8f765286a (patch) | |
| tree | 10fe43c4d6919c74b95df63ccd41d13635185c0c /config | |
| parent | 9fc0c958ddcb30d27dac36bd1de8636579778f9c (diff) | |
| download | dejagnu-73db65f5379532d038cb65b45c56f8d8f765286a.zip dejagnu-73db65f5379532d038cb65b45c56f8d8f765286a.tar.gz dejagnu-73db65f5379532d038cb65b45c56f8d8f765286a.tar.bz2 | |
* 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>
Diffstat (limited to 'config')
| -rw-r--r-- | config/unix.exp | 8 |
1 files changed, 7 insertions, 1 deletions
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] } |