From edac400fdf6c997967c6ba9332eb493b8aaddba8 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Fri, 1 Feb 2013 20:44:56 +0100 Subject: [PATCH] testsuite/Start.sh: added timeout 900 sec per test script. --- testsuite/Start.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testsuite/Start.sh b/testsuite/Start.sh index 041f2497..6762ddb6 100644 --- a/testsuite/Start.sh +++ b/testsuite/Start.sh @@ -4,18 +4,20 @@ export LANG=C SHFILE=/tmp/unittest-parallel.sh +MAX_SEC_PER_TEST=900 +export TIMEOUT=$MAX_SEC_PER_TEST if [ "$TRIES" = "3" ] ; then # Try a failing test thrice echo Retrying 3 times ls -t tests-to-run/*${1}*.sh | - perl -pe 's:(.*/(.*)).sh:bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh: ' \ + perl -pe 's:(.*/(.*)).sh:timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh: ' \ >$SHFILE else # Run a failing test once echo Not retrying ls -t tests-to-run/*${1}*.sh | - perl -pe 's:(.*/(.*)).sh:bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh:' \ + perl -pe 's:(.*/(.*)).sh:timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh:' \ >$SHFILE fi