ソースを参照

arm/lib: Relax "Listening for serial connection" regex

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>
Signed-off-by: Jon Mason <jon.mason@arm.com>
Peter Hoyes 5 ヶ月 前
コミット
5adb315517
1 ファイル変更1 行追加1 行削除
  1. 1 1
      meta-arm/lib/fvp/runner.py

+ 1 - 1
meta-arm/lib/fvp/runner.py

@@ -56,7 +56,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))