| Message ID | 20241218102304.3034598-1-peter.hoyes@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [styhead] arm/lib: Relax "Listening for serial connection" regex | expand |
diff --git a/meta-arm/lib/fvp/runner.py b/meta-arm/lib/fvp/runner.py index 4e414e99..8dba545a 100644 --- a/meta-arm/lib/fvp/runner.py +++ b/meta-arm/lib/fvp/runner.py @@ -57,7 +57,7 @@ class ConsolePortParser: while True: try: line = next(self._lines).strip().decode(errors='ignore') - m = re.match(r"^(\S+): Listening for serial connection on port (\d+)$", line) + m = re.search(r"(\S+): Listening for serial connection on port (\d+)$", line) if m: matched_console = m.group(1) matched_port = int(m.group(2))
Newer versions of the FVP now contain a full log entry for the "Listening for serial connection on port" regex of the form: INFO: FVP_NAME: terminal_uart: Listening for serial connection... Relax the regex to support this new logging format and change from re.match to re.search as the regex may not appear at the start of the line. This change is backwards-compatible with older versions of the FVP. Signed-off-by: Peter Hoyes <peter.hoyes@arm.com> --- meta-arm/lib/fvp/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)