selftest/s3-selftest.sh: knownfailure filtering for non-build-farm make test
authorStefan Metzmacher <metze@samba.org>
Wed, 8 Sep 2010 15:56:33 +0000 (17:56 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 10 Sep 2010 15:21:34 +0000 (17:21 +0200)
metze

selftest/s3-selftest.sh

index 2087b51af6ecd3ee3dda8e712c51bc1841bebf63..86e4b758650a92f64429ccbb2010dd2c0592c8b3 100755 (executable)
@@ -2,7 +2,6 @@
 
 FILTER_XFAIL="${PYTHON} -u ${SELFTESTDIR}/filter-subunit --expected-failures=${SOURCEDIR}/selftest/knownfail"
 SUBUNIT_FORMATTER="${PYTHON} -u ${SELFTESTDIR}/format-subunit --prefix=${SELFTESTPREFIX} --immediate"
-FORMAT_TEST_OUTPUT="${FILTER_XFAIL} | ${SUBUNIT_FORMATTER}"
 
 cleanup_and_exit() {
        if test "$1" = 0 -o -z "$1"; then
@@ -36,7 +35,7 @@ else
                        --exclude=${SOURCEDIR}/selftest/skip \
                        --socket-wrapper ${TESTS} \
        && touch ${SELFTESTPREFIX}/st_done ) | \
-               ${SUBUNIT_FORMATTER}
+               ${FILTER_XFAIL} | ${SUBUNIT_FORMATTER}
        EXIT_STATUS=$?
 
        st_test_done