s3-selftest: move all skipped test to skiplist.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Feb 15 12:52:22 CET 2011 on sn-devel-104

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 466855df7b5aea945040c4df528817b0e71e8afd..77ffc0c61a8c415098addb062ab49c797bb40dd3 100755 (executable)
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -35,14 +35,6 @@ tests="$tests GETADDRINFO POSIX UID-REGRESSION-TEST SHORTNAME-TEST"
 tests="$tests LOCAL-BASE64 LOCAL-GENCACHE POSIX-APPEND"
 tests="$tests LOCAL-string_to_sid"
 
-skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
-skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
-skipped3="MANGLE UTABLE PIPE_NUMBER"
-echo "Skipping the following tests:"
-echo "$skipped1"
-echo "$skipped2"
-echo "$skipped3"
-
 if test "x$SMBTORTURE_S3_SUBTESTS" != "x" ; then
     tests="$SMBTORTURE_S3_SUBTESTS"
 fi

diff --git a/source3/selftest/skip b/source3/selftest/skip
index 1dca282d9b1014a1898b653d25fb508cca3a7347..61fa03a2f5e8f7f025763fae4a9ffb675cae9979 100644 (file)
--- a/source3/selftest/skip
+++ b/source3/selftest/skip
@@ -1,20 +1,18 @@
-samba3.smbconftort     # Errors, needs smb.conf file
-samba3.randomipc
-samba3.negnowait
-samba3.nbench
-samba3.errmapextract
-samba3.trans2scan
-samba3.nttransscan
-samba3.deny1
-samba3.deny2
-samba3.openattr
-samba3.casetable
-samba3.eatest
-samba3.mangle
-samba3.utable
-samba3.pipe_number
-samba3.smbtorture_s3.plain.CHAIN1
-samba3.smbtorture_s3.crypt.CHAIN1
+samba3.smbtorture_s3.*.randomipc
+samba3.smbtorture_s3.*.negnowait
+samba3.smbtorture_s3.*.nbench
+samba3.smbtorture_s3.*.errmapextract
+samba3.smbtorture_s3.*.trans2scan
+samba3.smbtorture_s3.*.nttransscan
+samba3.smbtorture_s3.*.deny1
+samba3.smbtorture_s3.*.deny2
+samba3.smbtorture_s3.*.openattr
+samba3.smbtorture_s3.*.casetable
+samba3.smbtorture_s3.*.eatest
+samba3.smbtorture_s3.*.mangle
+samba3.smbtorture_s3.*.utable
+samba3.smbtorture_s3.*.pipe_number
+samba3.smbtorture_s3.*.CHAIN1
 samba3.*base.charset
 samba3.*base.tcondev
 samba3.*raw.acls