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:23:47 +0100 |
commit | 249dc825a006e465e9611f5f06e8a99882ed8ed1 (patch) | |
tree | 94a22b738e7e7f160633ac78cfcde7f44a7c9e78 /meta/lib/oeqa/utils | |
parent | 8a90c8bdd423b46c2f33e3751fa20a234ea82127 (diff) | |
download | poky-249dc825a006e465e9611f5f06e8a99882ed8ed1.tar.gz |
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.
(From OE-Core rev: 923d4bd548911caa0b419c10905895af1e8e7026)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils')
-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: | |||
133 | return False | 133 | return False |
134 | else: | 134 | else: |
135 | bb.note("Qemu pid didn't appeared in %s seconds" % self.runqemutime) | 135 | bb.note("Qemu pid didn't appeared in %s seconds" % self.runqemutime) |
136 | output = self.runqemu.stdout | ||
136 | self.kill() | 137 | self.kill() |
137 | bb.note("Output from runqemu: %s " % self.runqemu.stdout.read()) | 138 | bb.note("Output from runqemu:\n%s" % output.read()) |
138 | self.runqemu.stdout.close() | ||
139 | return False | 139 | return False |
140 | 140 | ||
141 | return self.is_alive() | 141 | return self.is_alive() |