r14865: - enforce timelimits for the tests

- and skip some long tests for now

metze

diff --git a/source/script/tests/selftest.sh b/source/script/tests/selftest.sh
index c61cf763801a2986027b6b9ff188be1294fff27d..6a6eef70fd6d7537bd655ae5bbdf4ffc7f1d591c 100755 (executable)
--- a/source/script/tests/selftest.sh
+++ b/source/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/source/script/tests/test_functions.sh b/source/script/tests/test_functions.sh
index 4e3b8ce7db85a58c5d4edbc60a1f776bf7321c48..6ad1c6951b3c9e989f8286850557117d65a74fbd 100644 (file)
--- a/source/script/tests/test_functions.sh
+++ b/source/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/source/script/tests/test_posix_s3.sh b/source/script/tests/test_posix_s3.sh
index 865650fcdd0d339d7e114acf7d25df9b4a20b7d2..f3636ef84af9681a98fe2e442e91ad8a7813515c 100755 (executable)
--- a/source/script/tests/test_posix_s3.sh
+++ b/source/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