diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2014-10-12 21:18:08 -0700 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2014-10-14 09:06:05 +0200 |
commit | 0c2c75a2d7afdb3e08aa29f6b996d953dcc3b5a1 (patch) | |
tree | c8ca2c8941d8a5e522b47db80534378ae045f08d /selftest/selftesthelpers.py | |
parent | 77b72d4c8e02e6bba9ef8c90287455a784afe9d8 (diff) | |
download | samba-0c2c75a2d7afdb3e08aa29f6b996d953dcc3b5a1.tar.gz |
filter-subunit: Drop support for allow_empty_output hack.
Change-Id: If4f336ef770202dcf69484b9bccc6c0c80bd5f9b
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Oct 14 09:06:05 CEST 2014 on sn-devel-104
Diffstat (limited to 'selftest/selftesthelpers.py')
-rw-r--r-- | selftest/selftesthelpers.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 0e2033bd2e3..05f8ae3be06 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -89,7 +89,7 @@ def valgrindify(cmdline): return valgrind + " " + cmdline -def plantestsuite(name, env, cmdline, allow_empty_output=False): +def plantestsuite(name, env, cmdline): """Plan a test suite. :param name: Testsuite name @@ -101,17 +101,13 @@ def plantestsuite(name, env, cmdline, allow_empty_output=False): print env if isinstance(cmdline, list): cmdline = " ".join(cmdline) - filter_subunit_args = [] - if not allow_empty_output: - filter_subunit_args.append("--fail-on-empty") + filter_subunit_args = ["--fail-on-empty"] if "$LISTOPT" in cmdline: filter_subunit_args.append("$LISTOPT") print "%s 2>&1 | %s/selftest/filter-subunit %s --prefix=\"%s.\" --suffix=\"(%s)\"" % (cmdline, srcdir(), " ".join(filter_subunit_args), name, env) - if allow_empty_output: - print >>sys.stderr, "WARNING: allowing empty subunit output from %s" % name def add_prefix(prefix, env, support_list=False): |