summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-03-04 14:22:35 +0100
committerGünther Deschner <gd@samba.org>2011-03-10 23:25:04 +0100
commitc8098246be66a96c5a9dfceab957c3d879746246 (patch)
treeae6baca788b883961b928229c96816fdb27c1045
parent88ff230ae9543fc22068392f44d8b6033e365abf (diff)
downloadsamba-c8098246be66a96c5a9dfceab957c3d879746246.tar.gz
samba-c8098246be66a96c5a9dfceab957c3d879746246.tar.bz2
samba-c8098246be66a96c5a9dfceab957c3d879746246.zip
waf-selftest: allow to call "make test SUBUNIT_FORMATTER=cat".
Guenther
-rw-r--r--source3/selftest/wscript4
-rw-r--r--source4/selftest/wscript4
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: