From: Stephen Warren Date: Wed, 17 Aug 2016 01:58:59 +0000 (-0600) Subject: test/py: match prompt only at line boundaries X-Git-Tag: KARO-TXSD-2017-03-15~277 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;ds=sidebyside;h=4ba58bdabd0ad8356401e5221e8377ebd412362d;p=karo-tx-uboot.git test/py: match prompt only at line boundaries This prevents capture of command output from terminating early on boards that use a simple prompt (e.g. "=> ") that appears in the middle of command output (e.g. crc32's "... ==> 2fa737e0"). Reported-by: Tom Rini Signed-off-by: Stephen Warren Tested-by: Tom Rini Reviewed-by: Heiko Schocher --- diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index ee9b928756..b1f474236e 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -106,7 +106,7 @@ class ConsoleBase(object): # Array slice removes leading/trailing quotes self.prompt = self.config.buildconfig['config_sys_prompt'][1:-1] - self.prompt_escaped = re.escape(self.prompt) + self.prompt_compiled = re.compile('^' + re.escape(self.prompt), re.MULTILINE) self.p = None self.disable_check_count = {pat[PAT_ID]: 0 for pat in bad_pattern_defs} self.eval_bad_patterns() @@ -201,7 +201,7 @@ class ConsoleBase(object): self.bad_pattern_ids[m - 1]) if not wait_for_prompt: return - m = self.p.expect([self.prompt_escaped] + self.bad_patterns) + m = self.p.expect([self.prompt_compiled] + self.bad_patterns) if m != 0: self.at_prompt = False raise Exception('Bad pattern found on console: ' + @@ -354,7 +354,7 @@ class ConsoleBase(object): self.bad_pattern_ids[m - 1]) self.u_boot_version_string = self.p.after while True: - m = self.p.expect([self.prompt_escaped, + m = self.p.expect([self.prompt_compiled, pattern_stop_autoboot_prompt] + self.bad_patterns) if m == 0: break