s3: Add subunit-test target.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 79e394a6a98089afd661a71e41a49a8c6131ebff..8a0364d17484b8423a1b2cdc8ea750fc6960ef4d 100644 (file)
--- 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 86e4b758650a92f64429ccbb2010dd2c0592c8b3..6105ff466065d2c494d782f66cdd347c6db816a4 100755 (executable)
--- 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