diff options
Diffstat (limited to 'meta/lib/oeqa/runtime')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/parselogs.py | 13 |
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): | |||
218 | 'Ordering cycle found, skipping', | 218 | 'Ordering cycle found, skipping', |
219 | ]) | 219 | ]) |
220 | 220 | ||
221 | cls.ignore_errors = ignore_errors | 221 | try: |
222 | cls.ignore_errors = ignore_errors[cls.td.get('MACHINE')] | ||
223 | except KeyError: | ||
224 | cls.logger.info('No ignore list found for this machine, using default') | ||
225 | cls.ignore_errors = ignore_errors['default'] | ||
222 | 226 | ||
223 | # Go through the log locations provided and if it's a folder | 227 | # Go through the log locations provided and if it's a folder |
224 | # create a list with all the .log files in it, if it's a file | 228 | # create a list with all the .log files in it, if it's a file |
@@ -268,13 +272,8 @@ class ParseLogsTest(OERuntimeTestCase): | |||
268 | grepcmd = grepcmd[:-1] | 272 | grepcmd = grepcmd[:-1] |
269 | grepcmd += '" ' + str(log) + " | grep -Eiv \'" | 273 | grepcmd += '" ' + str(log) + " | grep -Eiv \'" |
270 | 274 | ||
271 | try: | ||
272 | errorlist = self.ignore_errors[self.td.get('MACHINE')] | ||
273 | except KeyError: | ||
274 | self.msg += 'No ignore list found for this machine, using default\n' | ||
275 | errorlist = self.ignore_errors['default'] | ||
276 | 275 | ||
277 | for ignore_error in errorlist: | 276 | for ignore_error in self.ignore_errors: |
278 | ignore_error = ignore_error.replace('(', r'\(') | 277 | ignore_error = ignore_error.replace('(', r'\(') |
279 | ignore_error = ignore_error.replace(')', r'\)') | 278 | ignore_error = ignore_error.replace(')', r'\)') |
280 | ignore_error = ignore_error.replace("'", '.') | 279 | ignore_error = ignore_error.replace("'", '.') |