summaryrefslogtreecommitdiff
path: root/source3/script
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-04-03 11:32:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:52 -0500
commit97bfe0d0a0da8a4476db25918e268ee466a974c3 (patch)
treec2aad0c0aa9f8a54fff0b784a489bf1149176ed5 /source3/script
parent18e93247aa417eaf7c8fbf649ce45726ccba7433 (diff)
downloadsamba-97bfe0d0a0da8a4476db25918e268ee466a974c3.tar.gz
samba-97bfe0d0a0da8a4476db25918e268ee466a974c3.tar.bz2
samba-97bfe0d0a0da8a4476db25918e268ee466a974c3.zip
r14884: this doesn't work and causes processes to be left when using ctrl-c (SIGINT)
metze (This used to be commit 1ac5351646b18f28b1f9ed477b6e6046e1bdf783)
Diffstat (limited to 'source3/script')
-rw-r--r--source3/script/tests/test_functions.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 6ad1c6951b..4e3b8ce7db 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -161,10 +161,7 @@ testit() {
return 1
fi
- if [ -z "$TORTURE_MAXTIME" ];then
- TORTURE_MAXTIME=300
- fi
- ( timelimit $TORTURE_MAXTIME $cmdline > $TEST_LOG 2>&1 )
+ ( $cmdline > $TEST_LOG 2>&1 )
status=$?
if [ x"$status" != x"0" ]; then
echo "TEST OUTPUT:"