summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-09-08 17:56:33 +0200
committerStefan Metzmacher <metze@samba.org>2010-09-10 17:21:34 +0200
commitf101349c73a2c52f887cf1e3789fd42307b45297 (patch)
treefcf531d1ad01d25d35326ca5beb5e98ae3ac4df1
parentc91bdd2b0e02d31a1ea3a13a7f32a10e12c83fa8 (diff)
downloadsamba-f101349c73a2c52f887cf1e3789fd42307b45297.tar.gz
samba-f101349c73a2c52f887cf1e3789fd42307b45297.tar.bz2
samba-f101349c73a2c52f887cf1e3789fd42307b45297.zip
selftest/s3-selftest.sh: knownfailure filtering for non-build-farm make test
metze
-rwxr-xr-xselftest/s3-selftest.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/selftest/s3-selftest.sh b/selftest/s3-selftest.sh
index 2087b51af6..86e4b75865 100755
--- a/selftest/s3-selftest.sh
+++ b/selftest/s3-selftest.sh
@@ -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