s3-selftest: when skipping tests, use the selftest/skip file.

Guenther
(cherry picked from commit c575d30a32092665d104a06a12139528730b1287)

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 36c21dab23303632dd9738ac7cb5e0be213c6f19..8cdb1e26f41a6f526eb46f8941e4165569c44b6b 100755 (executable)
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -71,14 +71,6 @@ if test "x$POSIX_SUBTESTS" != "x" ; then
        tests="$POSIX_SUBTESTS"
 fi
 
-skipped="base.charset base.tcondev"
-skipped="$skipped raw.acls raw.composite raw.context"
-skipped="$skipped raw.ioctl"
-skipped="$skipped raw.qfileinfo raw.qfsinfo"
-skipped="$skipped raw.sfileinfo.base"
-
-echo "WARNING: Skipping tests $skipped"
-
 ADDARGS="$ADDARGS --option=torture:sharedelay=100000"
 #ADDARGS="$ADDARGS --option=torture:writetimeupdatedelay=500000"
 
@@ -87,16 +79,6 @@ for t in $tests; do
     if [ ! -z "$start" -a "$start" != $t ]; then
        continue;
     fi
-    skip=0
-    for s in $skipped; do
-       if [ x"$s" = x"$t" ]; then
-           skip=1;
-           break;
-       fi
-    done
-    if [ $skip = 1 ]; then
-       continue;
-    fi
     start=""
     name="$t"
     if [ "$t" = "base.delaywrite" ]; then

diff --git a/source3/selftest/skip b/source3/selftest/skip
index 64873839e47677c3766e4116bf6c2361cc0dcdd7..1dca282d9b1014a1898b653d25fb508cca3a7347 100644 (file)
--- a/source3/selftest/skip
+++ b/source3/selftest/skip
@@ -15,3 +15,12 @@ samba3.utable
 samba3.pipe_number
 samba3.smbtorture_s3.plain.CHAIN1
 samba3.smbtorture_s3.crypt.CHAIN1
+samba3.*base.charset
+samba3.*base.tcondev
+samba3.*raw.acls
+samba3.*raw.composite
+samba3.*raw.context
+samba3.*raw.ioctl
+samba3.*raw.qfileinfo
+samba3.*raw.qfsinfo
+samba3.*raw.sfileinfo.base