summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-16 00:21:19 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-16 00:21:19 +0200
commit2cc612cb6bb72e5dc52d12783aee04d2ef102198 (patch)
tree1d950e871607badde2f9dc92b4ef10a542b14069
parentd7123565698fefd16e7696c0e4bb4ec98f6f62ac (diff)
downloadsamba-2cc612cb6bb72e5dc52d12783aee04d2ef102198.tar.gz
samba-2cc612cb6bb72e5dc52d12783aee04d2ef102198.tar.bz2
samba-2cc612cb6bb72e5dc52d12783aee04d2ef102198.zip
s3-selftest: Allow overriding the subunit formatter.
(e.g. "make selftest SUBUNIT_FORMATTER=cat")
-rw-r--r--source3/Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 968e5ba42a..3d47384fc7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3177,6 +3177,8 @@ selftestdir = ../selftest
S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
+SUBUNIT_FORMATTER = $(PYTHON) $(selftestdir)/format-subunit --immediate
+
selftest:: all torture timelimit
@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
@@ -3189,7 +3191,7 @@ selftest:: all torture timelimit
--socket-wrapper $(TESTS) | \
$(PYTHON) $(selftestdir)/filter-subunit \
--expected-failures=$(srcdir)/selftest/knownfail | \
- $(PYTHON) $(selftestdir)/format-subunit --immediate
+ $(SUBUNIT_FORMATTER)
selftest-%:
$(MAKE) selftest TESTS=$*