mtest: catch ctrl-c and properly kill the child processes. Fixes #2281

pull/2995/head
Robert Doolittle 7 years ago
parent 2cf85ae16f
commit 60cfb87e69
  1. 9
      mesonbuild/mtest.py

@ -251,6 +251,7 @@ class TestHarness:
cwd=test.workdir,
preexec_fn=setsid)
timed_out = False
kill_test = False
if test.timeout is None:
timeout = None
else:
@ -261,6 +262,14 @@ class TestHarness:
if self.options.verbose:
print("%s time out (After %d seconds)" % (test.name, timeout))
timed_out = True
except KeyboardInterrupt:
mlog.warning("CTRL-C detected while running %s" % (test.name))
kill_test = True
except:
mlog.warning("Unknown error while running %s" % (test.name))
kill_test = True
if kill_test or timed_out:
# Python does not provide multiplatform support for
# killing a process and all its children so we need
# to roll our own.

Loading…
Cancel
Save