From 1c05f2121cc71a1b1e78edfd8cbde60e6d31d08b Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 7 Mar 2025 10:26:12 -0700 Subject: [PATCH] west: runners: openocd: Handle ADI OpenOCD fork version format The ADI fork of OpenOCD prints a modified version line; adjusting the regex to account for that different format when checking the OpenOCD version. Signed-off-by: Pete Johanson --- scripts/west_commands/runners/openocd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/west_commands/runners/openocd.py b/scripts/west_commands/runners/openocd.py index d30992a30a0..98dcf0b8b3a 100644 --- a/scripts/west_commands/runners/openocd.py +++ b/scripts/west_commands/runners/openocd.py @@ -232,7 +232,8 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner): out = self.check_output([self.openocd_cmd[0], '--version'], stderr=subprocess.STDOUT).decode() - version_match = re.search(r"Open On-Chip Debugger v?(\d+.\d+.\d+)", out) + # Account for version info format of ADI fork of OpenOCD as well + version_match = re.search(r"Open On-Chip Debugger.* v?(\d+.\d+.\d+)[ \n]", out) version = version_match.group(1).split('.') return [to_num(i) for i in version]