diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-01-26 08:44:13 +0530 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-26 21:56:51 +0200 |
commit | d9a4b367b476f96a2b0bdeb9b636767ed9b0037c (patch) | |
tree | d3750240e2e05f08c986a874733337aa6b14af0f | |
parent | 080674371f990cc40fd817f41a5e0d07c6acc2f9 (diff) | |
download | meson-d9a4b367b476f96a2b0bdeb9b636767ed9b0037c.zip meson-d9a4b367b476f96a2b0bdeb9b636767ed9b0037c.tar.gz meson-d9a4b367b476f96a2b0bdeb9b636767ed9b0037c.tar.bz2 |
mesontest: Don't overwrite test status on timeout
Earlier it would mark tests as "FAIL" even if it skipped.
-rwxr-xr-x | mesontest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesontest.py b/mesontest.py index bce4100..97eb219 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): |