diff options
| author | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-03-30 23:32:20 +0300 |
|---|---|---|
| committer | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-04-01 00:51:12 +0300 |
| commit | 5764bee2f42260c2869986b197fdccadac071257 (patch) | |
| tree | 09e79b210dc7641d1d8c33aee63a42ff85097f63 | |
| parent | 297749581dd4dcb4e68da4b1d0622d2916fb8db3 (diff) | |
| download | meson-5764bee2f42260c2869986b197fdccadac071257.zip meson-5764bee2f42260c2869986b197fdccadac071257.tar.gz meson-5764bee2f42260c2869986b197fdccadac071257.tar.bz2 | |
meson_test: Don't print logs from failing tests that are expected to fail.
| -rw-r--r-- | mesonbuild/scripts/meson_test.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py index 01da9b4..5407f2b 100644 --- a/mesonbuild/scripts/meson_test.py +++ b/mesonbuild/scripts/meson_test.py @@ -44,13 +44,14 @@ parser.add_argument('args', nargs='+') class TestRun(): - def __init__(self, res, returncode, duration, stdo, stde, cmd): + def __init__(self, res, returncode, should_fail, duration, stdo, stde, cmd): self.res = res self.returncode = returncode self.duration = duration self.stdo = stdo self.stde = stde self.cmd = cmd + self.should_fail = should_fail def get_log(self): res = '--- command ---\n' @@ -160,7 +161,7 @@ def run_single_test(wrap, test): else: res = 'FAIL' returncode = p.returncode - return TestRun(res, returncode, duration, stdo, stde, cmd) + return TestRun(res, returncode, test.should_fail, duration, stdo, stde, cmd) def print_stats(numlen, tests, name, result, i, logfile, jsonlogfile): global collected_logs, error_count, options @@ -172,7 +173,7 @@ def print_stats(numlen, tests, name, result, i, logfile, jsonlogfile): (num, name, padding1, result.res, padding2, result.duration) print(result_str) result_str += "\n\n" + result.get_log() - if result.returncode != 0: + if (result.returncode != 0) != result.should_fail: error_count += 1 if options.print_errorlogs: collected_logs.append(result_str) |