waf-selftest: allow to call "make test SUBUNIT_FORMATTER=cat".

Guenther

diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index 9a9cf90e95dc027b174ac61f543b9f006ab37071..f1c6510257e88ac33330be44b67cc2bec2a6060f 100644 (file)
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -85,7 +85,9 @@ def cmd_testonly(opt):
 
     env.TESTS  = Options.options.TESTS
 
-    env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
+    env.SUBUNIT_FORMATTER = os.getenv('SUBUNIT_FORMATTER')
+    if not env.SUBUNIT_FORMATTER:
+        env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
     env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/source3/selftest/knownfail'
 
     if Options.options.FAIL_IMMEDIATELY:

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 783b2ffe04e6dcaf2cdcba62d5b9c63eac025235..e9c24b055f738cc923e0c021eff9854d52eacf97 100644 (file)
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -85,7 +85,9 @@ def cmd_testonly(opt):
 
     env.TESTS  = Options.options.TESTS
 
-    env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
+    env.SUBUNIT_FORMATTER = os.getenv('SUBUNIT_FORMATTER')
+    if not env.SUBUNIT_FORMATTER:
+        env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
     env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/source4/selftest/knownfail'
 
     if Options.options.FAIL_IMMEDIATELY: