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>

diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py
index 3f205661ea90b4130bdbdc5bb6b8b6573ceed6ff..3980582dda2a733081c4f8fbd6d02f4326e359cf 100644 (file)
--- 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("'", '.')