summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/runtime
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-09-23 14:04:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-26 10:23:32 +0100
commit124dede2b20930d09a5cc319cb9333c5a912fa48 (patch)
tree9f19b257b25345f6bca2429dc26acf4e27ec3ea7 /meta/lib/oeqa/runtime
parentdd1416b719a30b18f21916d50fa431a88503918f (diff)
downloadopenembedded-core-contrib-124dede2b20930d09a5cc319cb9333c5a912fa48.tar.gz
oeqa/runtime/parselogs: select the correct machine-specific ignores early
This has no impact to the execution, but makes the following changes neater. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/runtime')
-rw-r--r--meta/lib/oeqa/runtime/cases/parselogs.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py
index 3f205661ea..3980582dda 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -218,7 +218,11 @@ class ParseLogsTest(OERuntimeTestCase):
'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
# 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 += '" ' + 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("'", '.')