summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/Makefile.in4
-rwxr-xr-xsource3/selftest/s3-selftest.sh4
2 files changed, 7 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 79e394a6a9..8a0364d174 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3400,6 +3400,7 @@ test:: all torture timelimit
SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
SOURCEDIR="$(srcdir)" \
RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
+ SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
PERL="$(PERL)" PYTHON="$(PYTHON)" \
$(srcdir)/selftest/s3-selftest.sh
@@ -3409,6 +3410,9 @@ test-%:
buildfarm-test:
$(MAKE) test RUN_FROM_BUILD_FARM=yes
+subunit-test:
+ $(MAKE) test SUBUNIT_FORMATTER=cat
+
SELFTEST_TESTENV = dc
testenv:
diff --git a/source3/selftest/s3-selftest.sh b/source3/selftest/s3-selftest.sh
index 86e4b75865..6105ff4660 100755
--- a/source3/selftest/s3-selftest.sh
+++ b/source3/selftest/s3-selftest.sh
@@ -1,7 +1,9 @@
#!/bin/sh
FILTER_XFAIL="${PYTHON} -u ${SELFTESTDIR}/filter-subunit --expected-failures=${SOURCEDIR}/selftest/knownfail"
-SUBUNIT_FORMATTER="${PYTHON} -u ${SELFTESTDIR}/format-subunit --prefix=${SELFTESTPREFIX} --immediate"
+if [ "x${SUBUNIT_FORMATTER}" = x"" ]; then
+ SUBUNIT_FORMATTER="${PYTHON} -u ${SELFTESTDIR}/format-subunit --prefix=${SELFTESTPREFIX} --immediate"
+fi
cleanup_and_exit() {
if test "$1" = 0 -o -z "$1"; then