aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/mtest.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py
index 6c4cdb3..cee4c5a 100644
--- a/mesonbuild/mtest.py
+++ b/mesonbuild/mtest.py
@@ -371,13 +371,17 @@ class SingleTestRunner:
endtime = time.time()
duration = endtime - starttime
if additional_error is None:
- stdout.seek(0)
- stdo = decode(stdout.read())
- if stderr != stdout:
- stderr.seek(0)
- stde = decode(stderr.read())
+ if stdout is None: # if stdout is None stderr should be as well
+ stdo = ''
+ stde = ''
else:
- stde = ""
+ stdout.seek(0)
+ stdo = decode(stdout.read())
+ if stderr != stdout:
+ stderr.seek(0)
+ stde = decode(stderr.read())
+ else:
+ stde = ""
else:
stdo = ""
stde = additional_error