diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-25 12:56:02 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-07 19:20:40 +0100 |
| commit | f13dde1f0851b3bb3d3b1406adaad5a48662cb02 (patch) | |
| tree | e485166e55876bd07a8d16b0b3198ecfaf64c4fb /mesonbuild | |
| parent | b05aee5c94938fdad51e44141db0552fb453ca25 (diff) | |
| download | meson-f13dde1f0851b3bb3d3b1406adaad5a48662cb02.zip meson-f13dde1f0851b3bb3d3b1406adaad5a48662cb02.tar.gz meson-f13dde1f0851b3bb3d3b1406adaad5a48662cb02.tar.bz2 | |
mtest: print TAP subtest count
The parentheses look ugly in the progress report. To keep it aligned
with the test outcomes, remove them from the outcomes as well.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/mtest.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 6df23d6..59d2389 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -470,6 +470,9 @@ class ConsoleLogger(TestLogger): dur=int(time.time() - self.progress_test.starttime), durlen=harness.duration_max_len, timeout=int(self.progress_test.timeout)) + detail = self.progress_test.detail + if detail: + right += ' ' + detail line = harness.format(self.progress_test, colorize=True, max_left_width=self.max_left_width, left=left, right=right) @@ -836,8 +839,18 @@ class TestRun: @property def detail(self) -> str: - if self.res is TestResult.FAIL: + if self.res is TestResult.PENDING: + return '' + if self.returncode: return returncode_to_status(self.returncode) + if self.results: + # running or succeeded + passed = sum((x.result.is_ok() for x in self.results)) + ran = sum((x.result is not TestResult.SKIP for x in self.results)) + if passed == ran: + return '{} subtests passed'.format(passed) + else: + return '{}/{} subtests passed'.format(passed, ran) return '' def complete(self, returncode: int, res: TestResult, @@ -1338,7 +1351,7 @@ class TestHarness: durlen=self.duration_max_len + 3) detail = result.detail if detail: - right += ' (' + detail + ')' + right += ' ' + detail return left + middle + right def summary(self) -> str: |