diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2017-06-01 15:26:48 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-06-03 13:55:41 +0200 |
| commit | 5b60600b32fa9d4c4842fcb66d6f2986410c0af9 (patch) | |
| tree | e0c8f011223e3e93df473cc651079d9713615493 /selftest/filter-subunit | |
| parent | b6201407a346a376e215f4303e55bbdf8febd5df (diff) | |
| download | samba-5b60600b32fa9d4c4842fcb66d6f2986410c0af9.tar.gz | |
selftest: use an additional directory of knownfail/flapping files
This makes it easier to add a temporary knownfail to cover a patch
series.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat Jun 3 13:55:41 CEST 2017 on sn-devel-144
Diffstat (limited to 'selftest/filter-subunit')
| -rwxr-xr-x | selftest/filter-subunit | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/selftest/filter-subunit b/selftest/filter-subunit index c3aba734ade..d71112296f2 100755 --- a/selftest/filter-subunit +++ b/selftest/filter-subunit @@ -27,11 +27,12 @@ sys.path.insert(0, "bin/python") import subunithelper parser = optparse.OptionParser("filter-subunit [options] < instream > outstream") -parser.add_option("--expected-failures", type="string", - help="File containing list of regexes matching tests to consider known " - "failures") -parser.add_option("--flapping", type="string", - help="File containing list of flapping tests, of which to ignore results.") +parser.add_option("--expected-failures", type="string", action="append", + help=("File or directory containing lists of regexes matching tests " + "to consider known failures")) +parser.add_option("--flapping", type="string", action="append", + help=("File or directory containing lists of flapping tests, " + "of which to ignore results.")) parser.add_option("--strip-passed-output", action="store_true", help="Whether to strip output from tests that passed") parser.add_option("--fail-immediately", action="store_true", @@ -66,13 +67,13 @@ if opts.perf_test_output: sys.exit(1) if opts.expected_failures: - expected_failures = subunithelper.read_test_regexes(opts.expected_failures) + expected_failures = subunithelper.read_test_regexes(*opts.expected_failures) else: expected_failures = {} if opts.flapping: - flapping = subunithelper.read_test_regexes(opts.flapping) + flapping = subunithelper.read_test_regexes(*opts.flapping) else: flapping = {} |