summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-09-05 21:13:15 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2018-09-05 21:13:42 +0300
commitdc594d8d59948d301919312903f3d3720faa92fd (patch)
tree393ecda62fc6f99a7dc447db28af14fbd7d60373
parentf50eb2dd4366a0d465dfbc6fa3720380510f89ae (diff)
downloadmeson-killll.tar.gz
Guard against the process redirecting stdout. Closes #3967.killll
-rw-r--r--mesonbuild/mtest.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py
index 910136fc9..8d9a58531 100644
--- a/mesonbuild/mtest.py
+++ b/mesonbuild/mtest.py
@@ -366,6 +366,9 @@ class SingleTestRunner:
except subprocess.TimeoutExpired:
stdo = b'Test process could not be killed.'
stde = b''
+ except ValueError:
+ stdo = b'Could not read output. Maybe the process has redirected its stdout/stderr?'
+ stde = b''
endtime = time.time()
duration = endtime - starttime
stdo = decode(stdo)