diff options
| author | Günther Deschner <gd@samba.org> | 2011-02-14 11:29:00 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-15 12:09:22 +0100 |
| commit | c575d30a32092665d104a06a12139528730b1287 (patch) | |
| tree | c4fb2fdd3c2981983e5e12e8acfa818749a69096 /source3 | |
| parent | 7312dacb6346ced62557ed2cc6a733907c7b3401 (diff) | |
| download | samba-c575d30a32092665d104a06a12139528730b1287.tar.gz samba-c575d30a32092665d104a06a12139528730b1287.tar.bz2 samba-c575d30a32092665d104a06a12139528730b1287.zip | |
s3-selftest: when skipping tests, use the selftest/skip file.
Guenther
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/script/tests/test_posix_s3.sh | 18 | ||||
| -rw-r--r-- | source3/selftest/skip | 9 |
2 files changed, 9 insertions, 18 deletions
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index 36c21dab23..8cdb1e26f4 100755 --- 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 64873839e4..1dca282d9b 100644 --- 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 |