sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

filter-subunit: Drop support for allow_empty_output hack.

Browse Source 
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
This commit is contained in:
Jelmer Vernooij 2014-10-12 21:18:08 -07:00 committed by Andrew Bartlett
parent 77b72d4c8e
commit 0c2c75a2d7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
selftest/selftesthelpers.py
View File

@ -89,7 +89,7 @@ def valgrindify(cmdline):
return valgrind + " " + cmdline return valgrind + " " + cmdline
def plantestsuite(name, env, cmdline, allow_empty_output=False): def plantestsuite(name, env, cmdline):
"""Plan a test suite. """Plan a test suite.
:param name: Testsuite name :param name: Testsuite name
@ -101,17 +101,13 @@ def plantestsuite(name, env, cmdline, allow_empty_output=False):
print env print env
if isinstance(cmdline, list): if isinstance(cmdline, list):
cmdline = " ".join(cmdline) cmdline = " ".join(cmdline)
filter_subunit_args = [] filter_subunit_args = ["--fail-on-empty"]
if not allow_empty_output:
filter_subunit_args.append("--fail-on-empty")
if "$LISTOPT" in cmdline: if "$LISTOPT" in cmdline:
filter_subunit_args.append("$LISTOPT") filter_subunit_args.append("$LISTOPT")
print "%s 2>&1 | %s/selftest/filter-subunit %s --prefix=\"%s.\" --suffix=\"(%s)\"" % (cmdline, print "%s 2>&1 | %s/selftest/filter-subunit %s --prefix=\"%s.\" --suffix=\"(%s)\"" % (cmdline,
srcdir(), srcdir(),
" ".join(filter_subunit_args), " ".join(filter_subunit_args),
name, env) 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): def add_prefix(prefix, env, support_list=False):