changeset 1633:a4823c561e28

Patrick Lauer suggested making the smoketest timeout configurable, and default to 3 minutes when FORK=1.
author Rob Landley <rob@landley.net>
date Tue, 15 Oct 2013 22:25:55 -0500
parents 0ffebfaa7b8f
children 23b9782e7ab0
files more/smoketest-all.sh more/smoketest.sh
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/more/smoketest-all.sh	Sun Oct 06 14:31:01 2013 -0500
+++ b/more/smoketest-all.sh	Tue Oct 15 22:25:55 2013 -0500
@@ -4,6 +4,8 @@
 
 # If $FORK is set, run them in parallel.
 
+[ -z "$FORK" ] || TIMEOUT=${TIMEOUT:-180}
+
 . sources/utility_functions.sh || exit 1
 
 function dotest()
--- a/more/smoketest.sh	Sun Oct 06 14:31:01 2013 -0500
+++ b/more/smoketest.sh	Tue Oct 15 22:25:55 2013 -0500
@@ -22,4 +22,4 @@
   sleep 1
   echo exit
 }
-sayhello | more/timeout.sh 60 more/run-emulator-from-build.sh "$1"
+sayhello | more/timeout.sh ${TIMEOUT:-60} more/run-emulator-from-build.sh "$1"