summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-04 13:34:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-04 23:05:47 +0100
commit605938b3bb19dcf6c7218648b4d16df9eaa675fc (patch)
tree604bbea515caf1be011becb07d28c0468eaa4810 /meta/lib
parent372cd58fe672726900af80f3e65a108984da2750 (diff)
downloadopenembedded-core-contrib-605938b3bb19dcf6c7218648b4d16df9eaa675fc.tar.gz
qemurunner: Show both the login console log and all logging upon failure
It is unclear when things fail which output was on which serial port. Improve the output to show the last lines of both data to improve debugging. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index ea867a2934..9aa2e7b3be 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -503,9 +503,8 @@ class QemuRunner:
(self.boottime, time.strftime("%D %H:%M:%S")))
tail = lambda l: "\n".join(l.splitlines()[-25:])
bootlog = self.decode_qemulog(bootlog)
- # in case bootlog is empty, use tail qemu log store at self.msg
- lines = tail(bootlog if bootlog else self.msg)
- self.logger.warning("Last 25 lines of text (%d):\n%s" % (len(bootlog), lines))
+ self.logger.warning("Last 25 lines of login console (%d):\n%s" % (len(bootlog), tail(bootlog)))
+ self.logger.warning("Last 25 lines of all logging (%d):\n%s" % (len(self.msg), tail(self.msg)))
self.logger.warning("Check full boot log: %s" % self.logfile)
self.stop()
return False