summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2016-08-16 19:58:59 -0600
committerTom Rini <trini@konsulko.com>2016-08-20 14:03:24 -0400
commit4ba58bdabd0ad8356401e5221e8377ebd412362d (patch)
treeb80de6d8be6d3dab36a9f70632e710e5da153e23 /test
parentfc18e9b3d5507845ea8a60a101ee3a368316068e (diff)
downloadu-boot-imx-4ba58bdabd0ad8356401e5221e8377ebd412362d.zip
u-boot-imx-4ba58bdabd0ad8356401e5221e8377ebd412362d.tar.gz
u-boot-imx-4ba58bdabd0ad8356401e5221e8377ebd412362d.tar.bz2
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 <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>
Diffstat (limited to 'test')
-rw-r--r--test/py/u_boot_console_base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
index ee9b928..b1f4742 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