Re: [PATCH 1/2] * config/unix.exp: add ability to set test timeout from site.exp.

[Filipe Brandenburger]

Hi Ben,

Just wondering if you also saw this patch which I sent in the series.
This patch adds a $test_timeout to unix.exp tests.

Let us know if you like the patch or if you have some concerns for us
to address before merging it.

Thank you!
Filipe


On Tue, Nov 10, 2015 at 5:35 PM, Filipe Brandenburger
<address@hidden> wrote:
> From: Brooks Moses <address@hidden>
>
> Signed-off-by: Brooks Moses <address@hidden>
> Signed-off-by: Filipe Brandenburger <address@hidden>
> ---
>  config/unix.exp | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/config/unix.exp b/config/unix.exp
> index 4b244cab5b4e..c9d80dcddb02 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]
>         }
> --
> 2.6.0.rc2.230.g3dd15c0
>