mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/runtime/parselogs: select the correct machine-specific ignores early

Browse Source 
This has no impact to the execution, but makes the following changes
neater.

(From OE-Core rev: 124dede2b20930d09a5cc319cb9333c5a912fa48)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2023-09-23 14:04:10 +01:00
committed by Richard Purdie
parent 17dbdc677a
commit 048e56f3b3
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/runtime/cases/parselogs.py
+6 -7
View File
@@ -218,7 +218,11 @@ class ParseLogsTest(OERuntimeTestCase):
'Ordering cycle found, skipping', 'Ordering cycle found, skipping',
]) ])
cls.ignore_errors = ignore_errors try:
cls.ignore_errors = ignore_errors[cls.td.get('MACHINE')]
except KeyError:
cls.logger.info('No ignore list found for this machine, using default')
cls.ignore_errors = ignore_errors['default']
# Go through the log locations provided and if it's a folder # Go through the log locations provided and if it's a folder
# create a list with all the .log files in it, if it's a file # create a list with all the .log files in it, if it's a file
@@ -268,13 +272,8 @@ class ParseLogsTest(OERuntimeTestCase):
grepcmd = grepcmd[:-1] grepcmd = grepcmd[:-1]
grepcmd += '" ' + str(log) + " | grep -Eiv \'" grepcmd += '" ' + str(log) + " | grep -Eiv \'"
try:
errorlist = self.ignore_errors[self.td.get('MACHINE')]
except KeyError:
self.msg += 'No ignore list found for this machine, using default\n'
errorlist = self.ignore_errors['default']
for ignore_error in errorlist: for ignore_error in self.ignore_errors:
ignore_error = ignore_error.replace('(', r'\(') ignore_error = ignore_error.replace('(', r'\(')
ignore_error = ignore_error.replace(')', r'\)') ignore_error = ignore_error.replace(')', r'\)')
ignore_error = ignore_error.replace("'", '.') ignore_error = ignore_error.replace("'", '.')