From: Mikko Rapeli <mikko.rapeli@linaro.org>
Date: Thu, 5 Oct 2023 15:22:25 +0000 (+0300)
Subject: qemurunner.py: detect login prompt without without utf-8 conversion
X-Git-Tag: yocto-5.2~4929
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f4921ced1e2aae546ff7cef232eec3e214c28be;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

qemurunner.py: detect login prompt without without utf-8 conversion

In case utf-8 conversion of the serial console data is flaky
due to bad characters in the stream.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 9aa2e7b3bea..5fed7059778 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -480,8 +480,7 @@ class QemuRunner:
                         self.log(data, extension = ".2")
                         data = b''
 
-                        decodedlog = self.decode_qemulog(bootlog)
-                        if self.boot_patterns['search_reached_prompt'] in decodedlog:
+                        if bytes(self.boot_patterns['search_reached_prompt'], 'utf-8') in bootlog:
                             self.server_socket.close()
                             self.server_socket = qemusock
                             stopread = True