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

test/py: make crash detection more robust

Browse source 
test/py contains logic to detect the target crashing and rebooting by
searching the console output for a U-Boot signon message, which will
presumably be emitted when the system boots after the crash/reset.

Currently, this logic only searches for the exact signon message that
was printed by the U-Boot version under test, upon the assumption that
binary is written into flash, and hence will be the version booted after
any reset. However, this is not a valid assumption; some test setups
download the U-Boot-under-test into RAM and boot it from there, and in
such a scenario an arbitrary U-Boot version may be located in flash and
hence run after any reset.

Fix the reset detection logic to match any U-Boot signon message. This
prevents false negatives.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Stephen Warren 2016-01-25 15:07:58 -07:00 committed by Simon Glass
parent c6db965f67
commit e787a58fe2
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/py/u_boot_console_base.py
View file

@ -150,12 +150,11 @@ class ConsoleBase(object):
bad_patterns = [] bad_patterns = []
bad_pattern_ids = [] bad_pattern_ids = []
if (self.disable_check_count['spl_signon'] == 0 and if (self.disable_check_count['spl_signon'] == 0):
self.u_boot_spl_signon): bad_patterns.append(pattern_u_boot_spl_signon)
bad_patterns.append(self.u_boot_spl_signon_escaped)
bad_pattern_ids.append('SPL signon') bad_pattern_ids.append('SPL signon')
if self.disable_check_count['main_signon'] == 0: if self.disable_check_count['main_signon'] == 0:
bad_patterns.append(self.u_boot_main_signon_escaped) bad_patterns.append(pattern_u_boot_main_signon)
bad_pattern_ids.append('U-Boot main signon') bad_pattern_ids.append('U-Boot main signon')
if self.disable_check_count['unknown_command'] == 0: if self.disable_check_count['unknown_command'] == 0:
bad_patterns.append(pattern_unknown_command) bad_patterns.append(pattern_unknown_command)
@ -299,18 +298,13 @@ class ConsoleBase(object):
self.p.logfile_read = self.logstream self.p.logfile_read = self.logstream
if self.config.buildconfig.get('CONFIG_SPL', False) == 'y': if self.config.buildconfig.get('CONFIG_SPL', False) == 'y':
self.p.expect([pattern_u_boot_spl_signon]) self.p.expect([pattern_u_boot_spl_signon])
self.u_boot_spl_signon = self.p.after
self.u_boot_spl_signon_escaped = re.escape(self.p.after)
else:
self.u_boot_spl_signon = None
self.p.expect([pattern_u_boot_main_signon]) self.p.expect([pattern_u_boot_main_signon])
self.u_boot_main_signon = self.p.after signon = self.p.after
self.u_boot_main_signon_escaped = re.escape(self.p.after) build_idx = signon.find(', Build:')
build_idx = self.u_boot_main_signon.find(', Build:')
if build_idx == -1: if build_idx == -1:
self.u_boot_version_string = self.u_boot_main_signon self.u_boot_version_string = signon
else: else:
self.u_boot_version_string = self.u_boot_main_signon[:build_idx] self.u_boot_version_string = signon[:build_idx]
while True: while True:
match = self.p.expect([self.prompt_escaped, match = self.p.expect([self.prompt_escaped,
pattern_stop_autoboot_prompt]) pattern_stop_autoboot_prompt])