diff options
| author | Mikko Rapeli <mikko.rapeli@linaro.org> | 2023-10-05 18:22:25 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-08 13:05:25 +0100 |
| commit | 23a50c8cca9dc5079ddd91b8281e66386a6af54e (patch) | |
| tree | 5e4174fc1e91295a0d802a61d3db6874ccbf453b | |
| parent | 0fb1ff0ffb527a6364cef7159c0d9dcb879e8dd9 (diff) | |
| download | poky-23a50c8cca9dc5079ddd91b8281e66386a6af54e.tar.gz | |
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 <mikko.rapeli@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 3 |
1 files changed, 1 insertions, 2 deletions
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: | |||
| 480 | self.log(data, extension = ".2") | 480 | self.log(data, extension = ".2") |
| 481 | data = b'' | 481 | data = b'' |
| 482 | 482 | ||
| 483 | decodedlog = self.decode_qemulog(bootlog) | 483 | if bytes(self.boot_patterns['search_reached_prompt'], 'utf-8') in bootlog: |
| 484 | if self.boot_patterns['search_reached_prompt'] in decodedlog: | ||
| 485 | self.server_socket.close() | 484 | self.server_socket.close() |
| 486 | self.server_socket = qemusock | 485 | self.server_socket = qemusock |
| 487 | stopread = True | 486 | stopread = True |
