diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-27 12:50:36 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-27 14:51:05 +0200 |
| commit | 0cb0427f134c8fdd79880642abef0ad1f115c3b3 (patch) | |
| tree | b85988945b8ca31237c62370070f4f3c8de615fd /selftest/selftesthelpers.py | |
| parent | 67a851a05074d2ffd72d54a482a72859e8377b2f (diff) | |
| download | samba-0cb0427f134c8fdd79880642abef0ad1f115c3b3.tar.gz samba-0cb0427f134c8fdd79880642abef0ad1f115c3b3.tar.bz2 samba-0cb0427f134c8fdd79880642abef0ad1f115c3b3.zip | |
selftest: Place the test environment at the end of the failure lines
This allows a knownfail entry to be added for only one environment, rather than
all environments.
Andrew Bartlett
Diffstat (limited to 'selftest/selftesthelpers.py')
| -rw-r--r-- | selftest/selftesthelpers.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 991574e05f..7fc085477d 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -101,20 +101,20 @@ def plantestsuite(name, env, cmdline, allow_empty_output=False): filter_subunit_args.append("--fail-on-empty") if "$LISTOPT" in cmdline: filter_subunit_args.append("$LISTOPT") - print "%s 2>&1 | %s/selftest/filter-subunit %s --prefix=\"%s.\"" % (cmdline, + print "%s 2>&1 | %s/selftest/filter-subunit %s --prefix=\"%s.\" --suffix=\"(%s)\"" % (cmdline, srcdir(), " ".join(filter_subunit_args), - name) + name, env) if allow_empty_output: print >>sys.stderr, "WARNING: allowing empty subunit output from %s" % name -def add_prefix(prefix, support_list=False): +def add_prefix(prefix, env, support_list=False): if support_list: listopt = "$LISTOPT " else: listopt = "" - return "%s/selftest/filter-subunit %s--fail-on-empty --prefix=\"%s.\"" % (srcdir(), listopt, prefix) + return "%s/selftest/filter-subunit %s--fail-on-empty --prefix=\"%s.\" --suffix=\"(%s)\"" % (srcdir(), listopt, prefix, env) def plantestsuite_loadlist(name, env, cmdline): @@ -128,7 +128,7 @@ def plantestsuite_loadlist(name, env, cmdline): if isinstance(cmdline, list): cmdline = " ".join(cmdline) support_list = ("$LISTOPT" in cmdline) - print "%s $LOADLIST 2>&1 | %s" % (cmdline, add_prefix(name, support_list)) + print "%s $LOADLIST 2>&1 | %s" % (cmdline, add_prefix(name, env, support_list)) def plantestsuite_idlist(name, env, cmdline): |