summaryrefslogtreecommitdiff
path: root/source3/script/tests/test_functions.sh
diff options
context:
space:
mode:
Diffstat (limited to 'source3/script/tests/test_functions.sh')
-rw-r--r--source3/script/tests/test_functions.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 4e3b8ce7db..6ad1c6951b 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -161,7 +161,10 @@ testit() {
return 1
fi
- ( $cmdline > $TEST_LOG 2>&1 )
+ if [ -z "$TORTURE_MAXTIME" ];then
+ TORTURE_MAXTIME=300
+ fi
+ ( timelimit $TORTURE_MAXTIME $cmdline > $TEST_LOG 2>&1 )
status=$?
if [ x"$status" != x"0" ]; then
echo "TEST OUTPUT:"