From aaaa314807347d2a87cc80d29f41a547d7368ad7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Oct 2023 13:30:55 +0100 Subject: qemurunner: Log the second serial console as well as the first To aid debugging, always log the second serial console as well as the first to a seperate log file. This should make it clearer what happened when we see test failures. (From OE-Core rev: 372cd58fe672726900af80f3e65a108984da2750) Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/lib/oeqa/utils/qemurunner.py') diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index b738a261d8..ea867a2934 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -113,9 +113,9 @@ class QemuRunner: msg = re_control_char.sub('', msg) return msg - def log(self, msg): + def log(self, msg, extension=""): if self.logfile: - with codecs.open(self.logfile, "ab") as f: + with codecs.open(self.logfile + extension, "ab") as f: f.write(msg) self.msg += self.decode_qemulog(msg) @@ -477,10 +477,7 @@ class QemuRunner: data = data + read if data: bootlog += data - if self.serial_ports < 2: - # this file has mixed console/kernel data, log it to logfile - self.log(data) - + self.log(data, extension = ".2") data = b'' decodedlog = self.decode_qemulog(bootlog) -- cgit v1.2.3-54-g00ecf