diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-08-29 20:51:41 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-30 16:16:43 +0100 |
| commit | 923d4bd548911caa0b419c10905895af1e8e7026 (patch) | |
| tree | 3bc0c3ca81db82dc13ebf62332db25675383360f /meta | |
| parent | 3f856556972617560b24cc86bfab027bed83bd49 (diff) | |
| download | openembedded-core-923d4bd548911caa0b419c10905895af1e8e7026.tar.gz openembedded-core-923d4bd548911caa0b419c10905895af1e8e7026.tar.bz2 openembedded-core-923d4bd548911caa0b419c10905895af1e8e7026.zip | |
lib/oeqa/utils: qemurunner: fix when runqemu errors out
When qemu doesn't start or runqemu errors out
(some wrong option passed or sudo needs a password for setting tap) we
want to display the output but oe-core commit 9de7fe11967576f4a8b24e653c6b9a02e5f6d85b/
poky commit 51588936d4a8cde3c9bb05800240c0a0f5dedf8d
changed the kill method and broke this code, so let's fix it.
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 6ee5b8577e..e7bd8b147b 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -133,9 +133,9 @@ class QemuRunner: return False else: bb.note("Qemu pid didn't appeared in %s seconds" % self.runqemutime) + output = self.runqemu.stdout self.kill() - bb.note("Output from runqemu: %s " % self.runqemu.stdout.read()) - self.runqemu.stdout.close() + bb.note("Output from runqemu:\n%s" % output.read()) return False return self.is_alive() |