summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-27 21:50:23 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-30 22:58:05 +0100
commit83cad86821b1addd8ec960ca30b5ff83f2e0ab12 (patch)
tree09da53eb4963ce785e7b983a70d279d065e56c4f
parent3eb5cf2914de4ab185c91136fc2de115933a4a37 (diff)
downloadsamba-83cad86821b1addd8ec960ca30b5ff83f2e0ab12.tar.gz
samba-83cad86821b1addd8ec960ca30b5ff83f2e0ab12.tar.bz2
samba-83cad86821b1addd8ec960ca30b5ff83f2e0ab12.zip
selftest: Don't generate subunit file when writing subunit to stdout.
-rw-r--r--selftest/wscript8
1 files changed, 3 insertions, 5 deletions
diff --git a/selftest/wscript b/selftest/wscript
index 7dd3ed265f..5a2cbd1c03 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -179,18 +179,16 @@ def cmd_testonly(opt):
cmd = '${CORE_COMMAND} --list'
else:
env.OPTIONS += ' --socket-wrapper'
- cmd = '(${CORE_COMMAND} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+ cmd = '(${CORE_COMMAND} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS}'
if (os.environ.get('RUN_FROM_BUILD_FARM') is None and
not Options.options.FILTERED_SUBUNIT):
- cmd += ' | ${FORMAT_TEST_OUTPUT}'
- else:
- cmd += ' | ${PYTHON} -u ${srcdir}/selftest/filter-subunit'
+ cmd += ' | tee ${SELFTEST_PREFIX}/subunit | ${FORMAT_TEST_OUTPUT}'
runcmd = EXPAND_VARIABLES(opt, cmd)
print("test: running %s" % runcmd)
ret = RUN_COMMAND(cmd, env=env)
+
if os.path.exists(".testrepository") and not Options.options.LIST:
- # "testr load -q" isn't
testrcmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null'
runcmd = EXPAND_VARIABLES(opt, testrcmd)
RUN_COMMAND(runcmd, env=env)