]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
qemurunner.py: detect login prompt without without utf-8 conversion
authorMikko Rapeli <mikko.rapeli@linaro.org>
Thu, 5 Oct 2023 15:22:25 +0000 (18:22 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 8 Oct 2023 12:05:24 +0000 (13:05 +0100)
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>
meta/lib/oeqa/utils/qemurunner.py

index 9aa2e7b3bea1d2560894a8057bd294ff1ec79731..5fed705977887534ae656f1414702b5c3044769b 100644 (file)
@@ -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