sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

selftest: Store the output of the last test run in st/subunit.

Browse Source 
If a testrepository repository is present, add the test output when it
has completed.
This commit is contained in:
Jelmer Vernooij 2010-06-25 01:21:14 +02:00
parent 700fcfbc63
commit e0aa54d0ed
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/selftest/wscript
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python
# vim: expandtab ft=python
# selftest main code.
@ -95,8 +96,6 @@ def cmd_testonly(opt):
env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output'
else:
env.FILTER_OPTIONS = '${FILTER_XFAIL}'
if not Options.options.FILTERED_SUBUNIT:
env.FILTER_OPTIONS += ' | ${FORMAT_TEST_OUTPUT}'
if Options.options.VALGRIND:
os.environ['VALGRIND'] = 'valgrind -q --num-callers=30'
@ -119,11 +118,19 @@ def cmd_testonly(opt):
if os.path.exists(st_done):
os.unlink(st_done)
cmd = '(${PERL} ../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS}'
cmd = '(${PERL} ../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
cmd += ' | ${FORMAT_TEST_OUTPUT}'
cmd = EXPAND_VARIABLES(opt, cmd)
print("test: running %s" % cmd)
ret = RUN_COMMAND(cmd, env=env)
if os.path.exists(".testrepository"):
# "testr load -q" isn't
cmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null'
cmd = EXPAND_VARIABLES(opt, cmd)
RUN_COMMAND(cmd, env=env)
if ret != 0:
print("ERROR: test failed with exit code %d" % ret)
sys.exit(ret)