diff options
| author | Simon McVittie <smcv@collabora.com> | 2020-08-05 21:08:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 23:08:05 +0300 |
| commit | 7db49db67d4aa7582cf46feb7157235e66aa95b1 (patch) | |
| tree | c8ed49db60f25d00f872043f7729111bdba94216 /mesonbuild/mtest.py | |
| parent | d4ec080f732a36a361911c3949e5644512642852 (diff) | |
| download | meson-7db49db67d4aa7582cf46feb7157235e66aa95b1.zip meson-7db49db67d4aa7582cf46feb7157235e66aa95b1.tar.gz meson-7db49db67d4aa7582cf46feb7157235e66aa95b1.tar.bz2 | |
mtest: TestResult.SKIP is not a failure (#7525)
* mtest: TestResult.SKIP is not a failure
If some but not all tests in a run were skipped, then the overall result
is given by whether there were any failures among the non-skipped tests.
Resolves: https://github.com/mesonbuild/meson/issues/7515
Signed-off-by: Simon McVittie <smcv@debian.org>
* Add test-cases for partially skipped TAP tests
issue7515.txt is the output of one of the real TAP tests in gjs, which
failed as a result of #7515. The version inline in meson.build is
a minimal reproducer.
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'mesonbuild/mtest.py')
| -rw-r--r-- | mesonbuild/mtest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 0d81692..817550e 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -489,7 +489,7 @@ class TestRun: failed = True elif isinstance(i, TAPParser.Test): results.append(i.result) - if i.result not in {TestResult.OK, TestResult.EXPECTEDFAIL}: + if i.result not in {TestResult.OK, TestResult.EXPECTEDFAIL, TestResult.SKIP}: failed = True elif isinstance(i, TAPParser.Error): results.append(TestResult.ERROR) |