diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-26 13:38:15 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-28 13:10:27 +0200 |
| commit | 659ec79245a9d9e5d45c380e8b82ec6236999032 (patch) | |
| tree | 14d0af27c28e82f2396a9b7ec1ca6573c3252af9 /source3/selftest/s3-selftest.sh | |
| parent | 8dcfe2e5c44184298b0aa5bb1a13e2108b31a9c4 (diff) | |
| download | samba-659ec79245a9d9e5d45c380e8b82ec6236999032.tar.gz samba-659ec79245a9d9e5d45c380e8b82ec6236999032.tar.bz2 samba-659ec79245a9d9e5d45c380e8b82ec6236999032.zip | |
selftest: Have only one set of selftest knownfail and skip files
Listing tests that are not ever proposed (eg samba4.* in the samba3 selftest)
is not an error, so just combine the lists.
This is being done because some folks trying to learn how our 'make
test' works are having trouble following the distributed nature of the
selftest system.
Andrew Bartlett
Diffstat (limited to 'source3/selftest/s3-selftest.sh')
| -rwxr-xr-x | source3/selftest/s3-selftest.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 ) | \ |