summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-04-02 12:52:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:52 -0500
commit186f442f4cd4a8434c4e2d4e2c0de97b855c5586 (patch)
tree03cd5ac04592bcc5282672af103c73b63eb658c8
parenta7d4912fcf7b7071eb3013b4b774512e5aa5d75a (diff)
downloadsamba-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)
-rwxr-xr-xsource3/script/tests/selftest.sh1
-rw-r--r--source3/script/tests/test_functions.sh5
-rwxr-xr-xsource3/script/tests/test_posix_s3.sh4
3 files changed, 7 insertions, 3 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c61cf76380..6a6eef70fd 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -21,6 +21,7 @@ cd $OLD_PWD
if [ -z "$TORTURE_MAXTIME" ]; then
TORTURE_MAXTIME=300
fi
+export TORTURE_MAXTIME
##
## setup the various environment variables we need
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:"
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 865650fcdd..f3636ef84a 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
tests="$base"
-skipped="BASE-CHARSET BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV"
+skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-OPENATTR BASE-TCONDEV"
echo "WARNING: Skipping tests $skipped"
@@ -55,7 +55,7 @@ for t in $tests; do
fi
start=""
name="$t"
- testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+ testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
done
testok $0 $failed