From 23a50c8cca9dc5079ddd91b8281e66386a6af54e Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Thu, 5 Oct 2023 18:22:25 +0300 Subject: 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. (From OE-Core rev: 3f4921ced1e2aae546ff7cef232eec3e214c28be) Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/lib/oeqa/utils') diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 9aa2e7b3be..5fed705977 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 -- cgit v1.2.3-54-g00ecf