summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-27 23:38:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-01 11:36:29 +0000
commit36a018e245a232f520ff946f152cc875927a6fb4 (patch)
treea294ff67b71782cefdf4a6c2b9e1c759c89a174f /meta/lib
parent21387613fec1a8c142ed48d7a74d587e205b0c98 (diff)
downloadopenembedded-core-contrib-36a018e245a232f520ff946f152cc875927a6fb4.tar.gz
openembedded-core-contrib-36a018e245a232f520ff946f152cc875927a6fb4.tar.bz2
openembedded-core-contrib-36a018e245a232f520ff946f152cc875927a6fb4.zip
oeqa/utils/commands: Add extra qemu failure logging
Rather than just referring the user to the logs containing the failure, print them on the console. This aids debugging with oe-selftest with parallelisation as the logs may otherwise be lost. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/utils/commands.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 01add68689..e6a35d3d25 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -336,7 +336,11 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
try:
qemu.start(params=qemuparams, ssh=ssh, runqemuparams=runqemuparams, launch_cmd=launch_cmd, discard_writes=discard_writes)
except bb.build.FuncFailed:
- raise Exception('Failed to start QEMU - see the logs in %s' % logdir)
+ msg = 'Failed to start QEMU - see the logs in %s' % logdir
+ if os.path.exists(qemu.qemurunnerlog):
+ with open(qemu.qemurunnerlog, 'r') as f:
+ msg = msg + "Qemurunner log output from %s:\n%s" % (qemu.qemurunnerlog, f.read())
+ raise Exception(msg)
yield qemu