mesontest: Don't overwrite test status on timeout

Earlier it would mark tests as "FAIL" even if it skipped.
8 years ago · d9a4b367b4
parent 080674371f
commit d9a4b367b4
1 changed files with 2 additions and 1 deletions
--- a/mesontest.py
+++ b/mesontest.py
@ -262,7 +262,8 @@ class TestHarness:
            if timed_out:
                res = 'TIMEOUT'
                self.timeout_count += 1
-            if p.returncode == GNU_SKIP_RETURNCODE:
+                self.fail_count += 1
+            elif p.returncode == GNU_SKIP_RETURNCODE:
                res = 'SKIP'
                self.skip_count += 1
            elif test.should_fail == bool(p.returncode):