[U-Boot] [PATCH] test/py: match prompt only at line boundaries

[U-Boot] [PATCH] test/py: match prompt only at line boundaries

[Stephen Warren]

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>
---
 test/py/u_boot_console_base.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
index ee9b928756fa..b1f474236e4e 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
-- 
2.9.3

[U-Boot] [PATCH] test/py: match prompt only at line boundaries

[Tom Rini]

On Tue, Aug 16, 2016 at 07:58:59PM -0600, Stephen Warren wrote:

> 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>

Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160817/17252e28/attachment.sig>

[U-Boot] [PATCH] test/py: match prompt only at line boundaries

[Heiko Schocher]

Hello Stephen,

Am 17.08.2016 um 03:58 schrieb Stephen Warren:
> 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>
> ---
>   test/py/u_boot_console_base.py | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)

Nice solution! For U-Boot prompt this should always work.

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
> index ee9b928756fa..b1f474236e4e 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
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] test/py: match prompt only at line boundaries

[Tom Rini]

On Tue, Aug 16, 2016 at 07:58:59PM -0600, Stephen Warren wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160821/2819294f/attachment.sig>