From 7db49db67d4aa7582cf46feb7157235e66aa95b1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 5 Aug 2020 21:08:05 +0100 Subject: 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 * 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 --- mesonbuild/mtest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/mtest.py') 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) -- cgit v1.1