michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sanitycheck: when timing out in handler, show correct log file

Browse source 
Fix issue where we timeout in handler and show the device.log file
instead.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2019-12-20 13:11:44 -05:00
commit 52b66c6ad1
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/sanitycheck
View file

@ -804,6 +804,7 @@ class DeviceHandler(Handler):
t.join(self.timeout)
if t.is_alive():
logger.debug("Timed out")
out_state = "timeout"
if ser.isOpen():
@ -2021,10 +2022,10 @@ class ProjectBuilder(FilterBuilder):
if os.path.exists(v_log) and "Valgrind" in self.instance.reason:
self.log_info("{}".format(v_log), inline_logs)
elif os.path.exists(d_log) and os.path.getsize(d_log) > 0:
self.log_info("{}".format(d_log), inline_logs)
elif os.path.exists(h_log) and os.path.getsize(h_log) > 0:
self.log_info("{}".format(h_log), inline_logs)
elif os.path.exists(d_log) and os.path.getsize(d_log) > 0:
self.log_info("{}".format(d_log), inline_logs)
else:
self.log_info("{}".format(b_log), inline_logs)