(testsuite) Add a --timeout option to test/run to override the default expect timeout.

3 files changed, 11 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index 74f359e7..88339dae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -75,6 +75,7 @@ bash-completion (2.x)
   * Cleanup scripts to run tests. Make runUnit and runCompletion use test/run.
     Make it possible to run tests from any directory.
   * Add a --debug-xtrace option to test/run using BASH_XTRACEFD from bash-4.1.
+  * Add a --timeout option to test/run to override the default expect timeout.
 
   [ Raphaël Droz ]
   * Add xsltproc completion (Alioth: #311843).
diff --git a/test/lib/library.exp b/test/lib/library.exp
index c806d9c0..f5829226 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -862,6 +862,12 @@ proc start_interactive_test {} {
     if {[info exists OPT_BASH_XTRACE]} {
         init_bash_xtrace
     }
+    global OPT_TIMEOUT
+    if {[info exists OPT_TIMEOUT]} {
+        global timeout
+        verbose "Changing default expect timeout from $timeout to $OPT_TIMEOUT"
+        set timeout $OPT_TIMEOUT
+    }
 }
 
 
diff --git a/test/run b/test/run
index 1b2fd12a..cdb1145a 100755
--- a/test/run
+++ b/test/run
@@ -11,6 +11,7 @@ usage() {
     echo "Interesting options:"
     echo "  --tool_exec=    Test against a different bash executable."
     echo "  --debug         Create a dbg.log in the test directory with detailed expect match information."
+    echo "  --timeout       Change expect timeout from the default of 10 seconds."
     echo "  --debug-xtrace  Create an xtrace.log in the test directory with set -x output. Requires bash 4.1."
     echo
     echo "Example run: ./run unit/_get_cword.exp unit/compgen.exp"
@@ -39,6 +40,8 @@ while [[ $# > 0 ]]; do
     case "$1" in
         --help|--usage) usage; exit 1;;
         --debug-xtrace) args+=(OPT_BASH_XTRACE=1);;
+        --timeout) shift; timeout=$1;;
+        --timeout=*) timeout=${1/--timeout=};;
         --tool=*) set_tool "${1#/--tool=}";;
         --tool) shift; set_tool "$1";;
         */completion/*.exp|*/unit/*.exp)
@@ -51,6 +54,7 @@ while [[ $# > 0 ]]; do
     shift
 done
 
+[[ -n $timeout ]] && args+=("OPT_TIMEOUT=$timeout")
 [[ -z $tool ]] && { echo "Must specify tool somehow"; exit 1; }
 
 runtest --outdir log --tool $tool "${args[@]}"