diff options
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index c19164e6e7..9a99859388 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
| @@ -532,10 +532,13 @@ class QemuRunner: | |||
| 532 | except OSError as e: | 532 | except OSError as e: |
| 533 | if e.errno != errno.ESRCH: | 533 | if e.errno != errno.ESRCH: |
| 534 | raise | 534 | raise |
| 535 | endtime = time.time() + self.runqemutime | 535 | try: |
| 536 | while self.runqemu.poll() is None and time.time() < endtime: | 536 | outs, errs = self.runqemu.communicate(timeout = self.runqemutime) |
| 537 | time.sleep(1) | 537 | if outs: |
| 538 | if self.runqemu.poll() is None: | 538 | self.logger.info("Output from runqemu:\n%s", outs.decode("utf-8")) |
| 539 | if errs: | ||
| 540 | self.logger.info("Stderr from runqemu:\n%s", errs.decode("utf-8")) | ||
| 541 | except TimeoutExpired: | ||
| 539 | self.logger.debug("Sending SIGKILL to runqemu") | 542 | self.logger.debug("Sending SIGKILL to runqemu") |
| 540 | os.killpg(os.getpgid(self.runqemu.pid), signal.SIGKILL) | 543 | os.killpg(os.getpgid(self.runqemu.pid), signal.SIGKILL) |
| 541 | if not self.runqemu.stdout.closed: | 544 | if not self.runqemu.stdout.closed: |
