Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

test/py: match prompt only at line boundaries

Browse source 
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 <trini@konsulko.com>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Tested-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Stephen Warren 2016-08-16 19:58:59 -06:00 committed by Tom Rini
parent fc18e9b3d5
commit 4ba58bdabd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/py/u_boot_console_base.py
View file

@ -106,7 +106,7 @@ class ConsoleBase(object):
# Array slice removes leading/trailing quotes # Array slice removes leading/trailing quotes
self.prompt = self.config.buildconfig['config_sys_prompt'][1:-1] 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.p = None
self.disable_check_count = {pat[PAT_ID]: 0 for pat in bad_pattern_defs} self.disable_check_count = {pat[PAT_ID]: 0 for pat in bad_pattern_defs}
self.eval_bad_patterns() self.eval_bad_patterns()
@ -201,7 +201,7 @@ class ConsoleBase(object):
self.bad_pattern_ids[m - 1]) self.bad_pattern_ids[m - 1])
if not wait_for_prompt: if not wait_for_prompt:
return return
m = self.p.expect([self.prompt_escaped] + self.bad_patterns) m = self.p.expect([self.prompt_compiled] + self.bad_patterns)
if m != 0: if m != 0:
self.at_prompt = False self.at_prompt = False
raise Exception('Bad pattern found on console: ' + raise Exception('Bad pattern found on console: ' +
@ -354,7 +354,7 @@ class ConsoleBase(object):
self.bad_pattern_ids[m - 1]) self.bad_pattern_ids[m - 1])
self.u_boot_version_string = self.p.after self.u_boot_version_string = self.p.after
while True: while True:
m = self.p.expect([self.prompt_escaped, m = self.p.expect([self.prompt_compiled,
pattern_stop_autoboot_prompt] + self.bad_patterns) pattern_stop_autoboot_prompt] + self.bad_patterns)
if m == 0: if m == 0:
break break