From d9a4b367b476f96a2b0bdeb9b636767ed9b0037c Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Thu, 26 Jan 2017 08:44:13 +0530
Subject: [PATCH] mesontest: Don't overwrite test status on timeout

Earlier it would mark tests as "FAIL" even if it skipped.
---
 mesontest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mesontest.py b/mesontest.py
index bce410093..97eb219c0 100755
--- 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):