From: Stefan Stanacar Date: Tue, 11 Mar 2014 12:11:08 +0000 (+0200) Subject: oeqa/utils/qemurunner: use the right kill call so we don't send SIGTERM to bitbake... X-Git-Tag: 2015-4~3385 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f4bf21b40ec6fa07c4a7bb450e3cfae12128dc2c;p=openembedded-core.git oeqa/utils/qemurunner: use the right kill call so we don't send SIGTERM to bitbake-worker After recent bitbake-worker changes [1] this was killing the bitbake-worker, which isn't what we want and kill(-pid) was the wrong call anyway. runqemu.pid is the right PGID as the process was started with preexec_fn=setpgrp (so no need to do os.getpgid(self.runqemu.pid)) [1] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=15688798520896690561824b2fdc227c8a365c82 Signed-off-by: Stefan Stanacar Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 5366a635fe..337b5874b2 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -163,13 +163,13 @@ class QemuRunner: if self.runqemu: bb.note("Sending SIGTERM to runqemu") - os.kill(-self.runqemu.pid,signal.SIGTERM) + os.killpg(self.runqemu.pid, signal.SIGTERM) endtime = time.time() + self.runqemutime while self.runqemu.poll() is None and time.time() < endtime: time.sleep(1) if self.runqemu.poll() is None: bb.note("Sending SIGKILL to runqemu") - os.kill(-self.runqemu.pid,signal.SIGKILL) + os.killpg(self.runqemu.pid, signal.SIGKILL) self.runqemu = None if self.server_socket: self.server_socket.close()