diff options
| author | Camilo Celis Guzman <camilo@pexip.com> | 2020-10-10 23:12:49 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-10-12 00:51:21 +0300 |
| commit | ba71fde18652ca156a35cd576dd9981202088424 (patch) | |
| tree | 0c496027e17e9a7305ea96c643c77783d584b883 | |
| parent | 96c31d9dbced6a6537dc04bdd9505fbbbb8ff9bf (diff) | |
| download | meson-ba71fde18652ca156a35cd576dd9981202088424.zip meson-ba71fde18652ca156a35cd576dd9981202088424.tar.gz meson-ba71fde18652ca156a35cd576dd9981202088424.tar.bz2 | |
mtest: collect failures regardless of colorized console
| -rw-r--r-- | mesonbuild/mtest.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index ee1d412..caf4039 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -917,15 +917,17 @@ class TestHarness: if result.res is TestResult.FAIL: result_str += ' ' + returncode_to_status(result.returncode) if not self.options.quiet or result.res not in ok_statuses: - if result.res not in ok_statuses and mlog.colorize_console(): - if result.res in bad_statuses: - self.collected_failures.append(result_str) - decorator = mlog.red - elif result.res is TestResult.SKIP: - decorator = mlog.yellow - else: - sys.exit('Unreachable code was ... well ... reached.') - print(decorator(result_str).get_text(True)) + if result.res not in ok_statuses: + self.collected_failures.append(result_str) + if mlog.colorize_console(): + if result.res in bad_statuses: + self.collected_failures.append(result_str) + decorator = mlog.red + elif result.res is TestResult.SKIP: + decorator = mlog.yellow + else: + sys.exit('Unreachable code was ... well ... reached.') + print(decorator(result_str).get_text(True)) else: print(result_str) result_str += "\n\n" + result.get_log() |