diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-04-02 12:52:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:52 -0500 |
| commit | 186f442f4cd4a8434c4e2d4e2c0de97b855c5586 (patch) | |
| tree | 03cd5ac04592bcc5282672af103c73b63eb658c8 /source3/script/tests/test_functions.sh | |
| parent | a7d4912fcf7b7071eb3013b4b774512e5aa5d75a (diff) | |
| download | samba-186f442f4cd4a8434c4e2d4e2c0de97b855c5586.tar.gz samba-186f442f4cd4a8434c4e2d4e2c0de97b855c5586.tar.bz2 samba-186f442f4cd4a8434c4e2d4e2c0de97b855c5586.zip | |
r14865: - enforce timelimits for the tests
- and skip some long tests for now
metze
(This used to be commit 1d52ae786d400441d9f5b30b4fa9e4e8ff64f7e4)
Diffstat (limited to 'source3/script/tests/test_functions.sh')
| -rw-r--r-- | source3/script/tests/test_functions.sh | 5 |
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:" |