From f96c42fed35073b59c14682eb32cb28bb0aedcf9 Mon Sep 17 00:00:00 2001 From: Soumen Ghosh <soumeng@codeaurora.org> Date: Tue, 30 Jan 2018 16:38:10 +0530 Subject: [PATCH] lrdp_v2: linux_banner string value was not matching with regular expression linux_banner string O/P was coming in different format, so we have added proper regular expression to match it Change-Id: Icd292b46132f2e9bd1d6d648626e48f729c68ad1 --- linux-ramdump-parser-v2/gdbmi.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/linux-ramdump-parser-v2/gdbmi.py b/linux-ramdump-parser-v2/gdbmi.py index 0043f3b..fbc5ed4 100644 --- a/linux-ramdump-parser-v2/gdbmi.py +++ b/linux-ramdump-parser-v2/gdbmi.py @@ -300,12 +300,14 @@ class GdbMI(object): raise GdbMIException( cmd, '\n'.join(result.lines + result.oob_lines)) match = re.search(r'^[$]\d+ = \\"(.*)(\\\\n\\")', result.lines[0]) + match_1 = re.search(r'^[$]\d+ = 0x[0-9a-fA-F]+ .* \\"(.*)(\\\\n\\")', result.lines[0]) + match_2 = re.search(r'^[$]\d+ = 0x[0-9a-fA-F]+ \\"(.*)(\\\\n\\")', result.lines[0]) if match: - return match.group(1) - else: - match = re.search(r'^[$]\d+ = 0x[0-9a-fA-F]+ .* \\"(.*)(\\\\n\\")', result.lines[0]) - if match: - return match.group(1) + return match.group(1).replace('\\\\n\\"',"") + elif match_1: + return match_1.group(1) + elif match_2: + return match_2.group(1).replace('\\\\n\\"', "") return None -- GitLab