diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-05-22 12:27:33 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-05-28 12:17:11 +1000 |
| commit | af443d0017125209cce61fbab88b2385bf1df9df (patch) | |
| tree | bb166a5ba2164f9d6fcaec78b1adda4a3e275da5 | |
| parent | 8bcaa145f23e606f4b850fe7147192a6fec11c2d (diff) | |
| download | samba-af443d0017125209cce61fbab88b2385bf1df9df.tar.gz samba-af443d0017125209cce61fbab88b2385bf1df9df.tar.bz2 samba-af443d0017125209cce61fbab88b2385bf1df9df.zip | |
Remove now-unused s3-selftest.sh wrapper
This is now always invokes via waf.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
| -rwxr-xr-x | source3/selftest/s3-selftest.sh | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/source3/selftest/s3-selftest.sh b/source3/selftest/s3-selftest.sh deleted file mode 100755 index f02054bfdc..0000000000 --- a/source3/selftest/s3-selftest.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -FILTER_XFAIL="${PYTHON} -u ${SELFTESTDIR}/filter-subunit --expected-failures=${SELFTESTDIR}/knownfail --flapping=${SELFTESTDIR}/flapping" -if [ "x${SUBUNIT_FORMATTER}" = x"" ]; then - SUBUNIT_FORMATTER="${PYTHON} -u ${SELFTESTDIR}/format-subunit --prefix=${SELFTESTPREFIX} --immediate" -fi - -if [ x"${FAIL_IMMEDIATELY}" != x"" ]; then - FILTER_XFAIL="${FILTER_XFAIL} --fail-immediately" -fi - -cleanup_and_exit() { - if test "$1" = 0 -o -z "$1"; then - exit 0 - else - exit $1 - fi -} - -st_test_done() { - test -f ${SELFTESTPREFIX}/st_done || { echo "SELFTEST FAILED"; cleanup_and_exit 1; } -} - -if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then - ( rm -f ${SELFTESTPREFIX}/st_done && \ - ${PERL} ${SELFTESTDIR}/selftest.pl \ - --binary-mapping=smbtorture3:smbtorture3,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth,smbtorture4:smbtorture \ - --prefix=${SELFTESTPREFIX} --target=samba3 \ - --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ - --exclude=${SELFTESTDIR}/skip \ - --srcdir="${SOURCEDIR}/.." \ - --socket-wrapper ${TESTS} \ - && touch ${SELFTESTPREFIX}/st_done ) | \ - ${FILTER_XFAIL} --strip-passed-output - EXIT_STATUS=$? - - st_test_done -else - ( rm -f ${SELFTESTPREFIX}/st_done && \ - ${PERL} ${SELFTESTDIR}/selftest.pl \ - --binary-mapping=smbtorture3:smbtorture3,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth,smbtorture4:smbtorture \ - --prefix=${SELFTESTPREFIX} --target=samba3 \ - --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ - --exclude=${SELFTESTDIR}/skip \ - --srcdir="${SOURCEDIR}/.." \ - --socket-wrapper ${TESTS} \ - && touch ${SELFTESTPREFIX}/st_done ) | \ - tee ${SELFTESTPREFIX}/subunit | ${FILTER_XFAIL} | ${SUBUNIT_FORMATTER} - EXIT_STATUS=$? - - st_test_done -fi - -cleanup_and_exit ${EXIT_STATUS} |