From c8098246be66a96c5a9dfceab957c3d879746246 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 4 Mar 2011 14:22:35 +0100
Subject: waf-selftest: allow to call "make test SUBUNIT_FORMATTER=cat".

Guenther
---
 source3/selftest/wscript | 4 +++-
 source4/selftest/wscript | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index 9a9cf90e95..f1c6510257 100644
--- 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 783b2ffe04..e9c24b055f 100644
--- 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:
-- 
cgit