public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Enrico Jorns <ejo@pengutronix.de>
To: openembedded-core@lists.openembedded.org
Cc: yocto@pengutronix.de, ejo@pengutronix.de,
	Richard Purdie <richard.purdie@linuxfoundation.org>,
	Alexander Kanavin <alex.kanavin@gmail.com>,
	alexandre.belloni@bootlin.com
Subject: [PATCH v2 4/9] oeqa/utils/qemurunner: support ignoring vt100 escape sequences
Date: Fri, 31 Mar 2023 12:40:20 +0200	[thread overview]
Message-ID: <20230331104025.1478393-5-ejo@pengutronix.de> (raw)
In-Reply-To: <20230331104025.1478393-1-ejo@pengutronix.de>

If we talk to terminals that like colors, we need to ignore the vt100
escape sequences when matching strings.

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 meta/lib/oeqa/utils/qemurunner.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 05385763ac..95c9e6596c 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -30,6 +30,7 @@ control_range = list(range(0,32))+list(range(127,160))
 control_chars = [chr(x) for x in control_range
                 if chr(x) not in string.printable]
 re_control_char = re.compile('[%s]' % re.escape("".join(control_chars)))
+re_vt100 = re.compile(r'(\x1b\[|\x9b)[^@-_a-z]*[@-_a-z]|\x1b[@-_a-z]')
 
 class QemuRunner:
 
@@ -662,7 +663,7 @@ class QemuRunner:
                 time.sleep(0.1)
                 answer = self.server_socket.recv(1024)
                 if answer:
-                    data += answer.decode('utf-8')
+                    data += re_vt100.sub("", answer.decode('utf-8'))
                     # Search the prompt to stop
                     if re.search(self.boot_patterns['search_cmd_finished'], data):
                         break
-- 
2.39.2



  parent reply	other threads:[~2023-03-31 10:40 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-31 10:40 [PATCH v2 0/9] Add barebox bootloader support (and testing) Enrico Jorns
2023-03-31 10:40 ` [PATCH v2 1/9] barebox: add initial support Enrico Jorns
2023-03-31 10:40 ` [PATCH v2 2/9] barebox-tools: add initial barebox tools support Enrico Jorns
2023-03-31 10:40 ` [PATCH v2 3/9] barebox: set default BAREBOX_CONFIG for qemu machines Enrico Jorns
2023-03-31 14:04   ` Alexander Kanavin
2023-04-03 11:42     ` Enrico Jörns
2023-04-11 14:16       ` Alexander Kanavin
2023-04-24 15:15         ` Enrico Jörns
2023-03-31 10:40 ` Enrico Jorns [this message]
2023-03-31 14:05   ` [PATCH v2 4/9] oeqa/utils/qemurunner: support ignoring vt100 escape sequences Alexander Kanavin
2023-04-03 13:02     ` Enrico Jörns
2023-04-11 14:17       ` Alexander Kanavin
2023-03-31 10:40 ` [PATCH v2 5/9] oeqa/utils/qemurunner: simplify output parsing and make crlf-compatible Enrico Jorns
2023-03-31 10:40 ` [PATCH v2 6/9] oeqa/utils/commands: document runqemu context manager Enrico Jorns
2023-03-31 10:40 ` [PATCH v2 7/9] oeqa: support passing custom boot patterns to runqemu Enrico Jorns
2023-03-31 10:40 ` [PATCH v2 8/9] oeqa/selftest/cases: add barebox tests Enrico Jorns
2023-03-31 10:40 ` [PATCH v2 9/9] oeqa/selftest/cases: add basic u-boot test Enrico Jorns
2023-03-31 14:03 ` [PATCH v2 0/9] Add barebox bootloader support (and testing) Alexander Kanavin
2023-04-03 15:49 ` Richard Purdie
2023-04-03 21:20   ` Enrico Jörns
2023-04-04  2:33     ` [OE-core] " Khem Raj
2023-04-04 11:13       ` Enrico Jörns
2023-04-04 16:11         ` Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230331104025.1478393-5-ejo@pengutronix.de \
    --to=ejo@pengutronix.de \
    --cc=alex.kanavin@gmail.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=richard.purdie@linuxfoundation.org \
    --cc=yocto@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox