diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/selftest/knownfail | 16 | ||||
| -rw-r--r-- | source3/selftest/quick | 1 | ||||
| -rwxr-xr-x | source3/selftest/s3-selftest.sh | 6 | ||||
| -rw-r--r-- | source3/selftest/skip | 22 | ||||
| -rw-r--r-- | source3/selftest/slow | 1 |
5 files changed, 3 insertions, 43 deletions
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail deleted file mode 100644 index 4f746c8d70..0000000000 --- a/source3/selftest/knownfail +++ /dev/null @@ -1,16 +0,0 @@ -^samba3.blackbox.failure # this is designed to fail, for testing our test infrastructure -.*printer.*print_test_extended # fails on some hosts due to timing issues ? -.*printer.*print_test # fails on some hosts due to timing issues ? -^samba3.posix_s3.rap.printing # fails sometimes on sn-devel -^samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ? -^samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure -^samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure -.*driver.add_driver_timestamps # we only can store dates, not timestamps -^samba3.raw.mux.* #This test is flaky on the async lock time -^samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel -^samba3.posix_s3.nbt.dgram.*netlogon2 -^samba3.*rap.sam.*.useradd # Not provided by Samba 3 -^samba3.*rap.sam.*.userdelete # Not provided by Samba 3 -^samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3 -^samba3.posix_s3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered - diff --git a/source3/selftest/quick b/source3/selftest/quick deleted file mode 100644 index bb3b066b49..0000000000 --- a/source3/selftest/quick +++ /dev/null @@ -1 +0,0 @@ -#none diff --git a/source3/selftest/s3-selftest.sh b/source3/selftest/s3-selftest.sh index a9ff875da2..4943b1e2a6 100755 --- a/source3/selftest/s3-selftest.sh +++ b/source3/selftest/s3-selftest.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILTER_XFAIL="${PYTHON} -u ${SELFTESTDIR}/filter-subunit --expected-failures=${SOURCEDIR}/selftest/knownfail" +FILTER_XFAIL="${PYTHON} -u ${SELFTESTDIR}/filter-subunit --expected-failures=${SELFTESTDIR}/knownfail" if [ "x${SUBUNIT_FORMATTER}" = x"" ]; then SUBUNIT_FORMATTER="${PYTHON} -u ${SELFTESTDIR}/format-subunit --prefix=${SELFTESTPREFIX} --immediate" fi @@ -23,7 +23,7 @@ if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient3:smbclient,ntlm_auth3:ntlm_auth \ --prefix=${SELFTESTPREFIX} --target=samba3 \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ - --exclude=${SOURCEDIR}/selftest/skip \ + --exclude=${SELFTESTDIR}/skip \ --srcdir="${SOURCEDIR}/.." \ --socket-wrapper ${TESTS} \ && touch ${SELFTESTPREFIX}/st_done ) | \ @@ -37,7 +37,7 @@ else --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient3:smbclient,ntlm_auth3:ntlm_auth \ --prefix=${SELFTESTPREFIX} --target=samba3 \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ - --exclude=${SOURCEDIR}/selftest/skip \ + --exclude=${SELFTESTDIR}/skip \ --srcdir="${SOURCEDIR}/.." \ --socket-wrapper ${TESTS} \ && touch ${SELFTESTPREFIX}/st_done ) | \ diff --git a/source3/selftest/skip b/source3/selftest/skip deleted file mode 100644 index 5e681729ce..0000000000 --- a/source3/selftest/skip +++ /dev/null @@ -1,22 +0,0 @@ -^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.*base.charset -^samba3.*raw.acls -^samba3.*raw.composite -^samba3.*raw.context -^samba3.*raw.ioctl -^samba3.*raw.qfileinfo -^samba3.*raw.qfsinfo -^samba3.*raw.sfileinfo.base diff --git a/source3/selftest/slow b/source3/selftest/slow deleted file mode 100644 index bb3b066b49..0000000000 --- a/source3/selftest/slow +++ /dev/null @@ -1 +0,0 @@ -#none |