sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

rootfs.py: Use one way to exclude lines in _log_check_error() 

Before there were three different ways to exclude a line from being
searched for error messages in _log_check_error(). Now there is only
one: an array of regular expressions. This should make it easy to add
more excludes if nedded.

(From OE-Core rev: 321df88088fbfa657b61b2bae32751f03daec46f)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2016-05-19 00:28:15 +02:00 committed by Richard Purdie
parent a653f36814
commit e3e8d500e2
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/lib/oe/rootfs.py
View File

@ -54,26 +54,25 @@ class Rootfs(object):
% (self.d.getVar('PN', True), m.group(), line))
def _log_check_error(self):
# Ignore any lines containing log_check to avoid recursion, and ignore
# lines beginning with a + since sh -x may emit code which isn't
# actually executed, but may contain error messages
excludes = [ 'log_check', r'^\+' ]
if hasattr(self, 'log_check_expected_errors_regexes'):
excludes.extend(self.log_check_expected_errors_regexes)
excludes = [re.compile(x) for x in excludes]
r = re.compile(self.log_check_regex)
log_path = self.d.expand("${T}/log.do_rootfs")
with open(log_path, 'r') as log:
found_error = 0
message = "\n"
for line in log:
if 'log_check' in line:
continue
# sh -x may emit code which isn't actually executed
if line.startswith('+'):
continue
if hasattr(self, 'log_check_expected_errors_regexes'):
m = None
for ee in self.log_check_expected_errors_regexes:
m = re.search(ee, line)
if m:
break
for ee in excludes:
m = ee.search(line)
if m:
continue
break
if m:
continue
m = r.search(line)
if m: