aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2020-08-03 13:31:42 +0100
committerNirbheek Chauhan <nirbheek@centricular.com>2020-09-09 18:10:18 +0530
commitefaf89e08c7680a39644aac710b445f951896503 (patch)
treec25598df332ac5643ad36d3836a6a58a9d730290
parent68ed748f84f14c2d4e62dcbd123816e5898eb04c (diff)
downloadmeson-efaf89e08c7680a39644aac710b445f951896503.zip
meson-efaf89e08c7680a39644aac710b445f951896503.tar.gz
meson-efaf89e08c7680a39644aac710b445f951896503.tar.bz2
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>
-rw-r--r--mesonbuild/mtest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py
index e0137a8..e6b12e5 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)