diff options
| author | Stephen Warren <swarren@nvidia.com> | 2016-02-05 18:04:43 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-02-09 15:41:19 -0700 |
| commit | c82ce04a3f38bb91465da6b2fd9d8dcb0e81f94b (patch) | |
| tree | 41bc6a73c290c4c7bca33a9f77d1276e4ddece01 /test/py | |
| parent | d8926811fd8b0d48e3bc99627c95544013bd3a7b (diff) | |
| download | u-boot-imx-c82ce04a3f38bb91465da6b2fd9d8dcb0e81f94b.zip u-boot-imx-c82ce04a3f38bb91465da6b2fd9d8dcb0e81f94b.tar.gz u-boot-imx-c82ce04a3f38bb91465da6b2fd9d8dcb0e81f94b.tar.bz2 | |
test/py: capture the entire U-Boot version at boot
The existing regex simply ensures that the captured version string doesn't
go past the end of a line. We really want to grab as much as possible. Do
this by explicitly including a ) character at the end of the regex to
match the last character of the version test.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'test/py')
| -rw-r--r-- | test/py/u_boot_console_base.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index cc54273..7e1e9d4 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -17,8 +17,8 @@ import sys import u_boot_spawn # Regexes for text we expect U-Boot to send to the console. -pattern_u_boot_spl_signon = re.compile('(U-Boot SPL \\d{4}\\.\\d{2}-[^\r\n]*)') -pattern_u_boot_main_signon = re.compile('(U-Boot \\d{4}\\.\\d{2}-[^\r\n]*)') +pattern_u_boot_spl_signon = re.compile('(U-Boot SPL \\d{4}\\.\\d{2}[^\r\n]*\\))') +pattern_u_boot_main_signon = re.compile('(U-Boot \\d{4}\\.\\d{2}[^\r\n]*\\))') pattern_stop_autoboot_prompt = re.compile('Hit any key to stop autoboot: ') pattern_unknown_command = re.compile('Unknown command \'.*\' - try \'help\'') pattern_error_notification = re.compile('## Error: ') @@ -312,12 +312,7 @@ class ConsoleBase(object): if m != 0: raise Exception('Bad pattern found on console: ' + self.bad_pattern_ids[m - 1]) - signon = self.p.after - build_idx = signon.find(', Build:') - if build_idx == -1: - self.u_boot_version_string = signon - else: - self.u_boot_version_string = signon[:build_idx] + self.u_boot_version_string = self.p.after while True: m = self.p.expect([self.prompt_escaped, pattern_stop_autoboot_prompt] + self.bad_patterns) |