aboutsummaryrefslogtreecommitdiff
path: root/mesontest.py
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2016-12-01 16:15:58 -0300
committerThibault Saunier <tsaunier@gnome.org>2016-12-02 20:04:33 -0300
commit56a6f86827e433b7dc254308e75dfe01bcb0eb8a (patch)
tree0330a8c19ce2fe41522962cbf0d415eac40711de /mesontest.py
parent6203e3ae349f36d6fd744f55d597d436ddd2a36e (diff)
downloadmeson-56a6f86827e433b7dc254308e75dfe01bcb0eb8a.zip
meson-56a6f86827e433b7dc254308e75dfe01bcb0eb8a.tar.gz
meson-56a6f86827e433b7dc254308e75dfe01bcb0eb8a.tar.bz2
mesontest: Do not timeout when running inside GDB
Diffstat (limited to 'mesontest.py')
-rwxr-xr-xmesontest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesontest.py b/mesontest.py
index 65b4159..aaba053 100755
--- a/mesontest.py
+++ b/mesontest.py
@@ -199,8 +199,9 @@ class TestHarness:
cwd=test.workdir,
preexec_fn=setsid)
timed_out = False
+ timeout = test.timeout if not self.options.gdb else None
try:
- (stdo, stde) = p.communicate(timeout=test.timeout)
+ (stdo, stde) = p.communicate(timeout=timeout)
except subprocess.TimeoutExpired:
timed_out = True
# Python does not provide multiplatform support for