diff options
author | Amitay Isaacs <amitay@gmail.com> | 2012-02-03 12:04:32 +1100 |
---|---|---|
committer | Amitay Isaacs <amitay@samba.org> | 2012-02-03 07:00:04 +0100 |
commit | db869c5812053f7b71ab92e88e52bed148cad01b (patch) | |
tree | 39458226902a27621e2e1e714125a466cb9a5d6f | |
parent | 571ee0b1ffcee3b1b0a5793c8bb1146cd69545f5 (diff) | |
download | samba-db869c5812053f7b71ab92e88e52bed148cad01b.tar.gz samba-db869c5812053f7b71ab92e88e52bed148cad01b.tar.bz2 samba-db869c5812053f7b71ab92e88e52bed148cad01b.zip |
selftest: Fix the exit code of make test when run in buildfarm
When make test is run in buildfarm environment (RUN_FROM_BUILD_FARM=1),
last process in make test pipeline is subunit-filter. This subunit-filter
is responsible for converting failure test result to xfail for known
failures. While converting failures to xfail, it sets exitcode=1. If
this is the last process in the pipeline make test fails, which is
the observed behavior in buildfarm.
In autobuild, there is additional process in the pipeline format-subunit
which processes the output of subunit-filter and correctly terminates
with exit code=0. The buildfarm make test failure is fixed by adding
extra filter-subunit in the pipeline, as the extra filter-subunit
exits correctly with exit code=0.
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Fri Feb 3 07:00:04 CET 2012 on sn-devel-104
-rw-r--r-- | selftest/wscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/selftest/wscript b/selftest/wscript index 4bd4e665c1..1bfa9f3d47 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -183,6 +183,8 @@ def cmd_testonly(opt): if (os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT): cmd += ' | tee ${SELFTEST_PREFIX}/subunit | ${FORMAT_TEST_OUTPUT}' + else: + cmd += ' | ${FILTER_OPTIONS}' runcmd = EXPAND_VARIABLES(opt, cmd) print("test: running %s" % runcmd) |