diff options
| -rw-r--r-- | scripts/lib/checklayer/cases/bsp.py | 16 | ||||
| -rw-r--r-- | scripts/lib/checklayer/cases/common.py | 5 |
2 files changed, 10 insertions, 11 deletions
diff --git a/scripts/lib/checklayer/cases/bsp.py b/scripts/lib/checklayer/cases/bsp.py index 7fd56f5d36c..96d819c6bae 100644 --- a/scripts/lib/checklayer/cases/bsp.py +++ b/scripts/lib/checklayer/cases/bsp.py @@ -42,16 +42,14 @@ class BSPCheckLayer(OECheckLayerTestCase): if not self.td['machines']: self.skipTest('No machines set with --machines.') - msg = [] + for machine in self.td['machines']: - # In contrast to test_machine_signatures() below, errors are fatal here. - try: - get_signatures(self.td['builddir'], failsafe=False, machine=machine) - except RuntimeError as ex: - msg.append(str(ex)) - if msg: - msg.insert(0, 'The following machines broke a world build:') - self.fail('\n'.join(msg)) + with self.subTest(machine=machine): + # In contrast to test_machine_signatures() below, errors are fatal here. + try: + get_signatures(self.td['builddir'], failsafe=False, machine=machine) + except RuntimeError as ex: + self.fail(str(ex)) def test_machine_signatures(self): ''' diff --git a/scripts/lib/checklayer/cases/common.py b/scripts/lib/checklayer/cases/common.py index b82304e3616..d5e821ab0e0 100644 --- a/scripts/lib/checklayer/cases/common.py +++ b/scripts/lib/checklayer/cases/common.py @@ -56,5 +56,6 @@ class CommonCheckLayer(OECheckLayerTestCase): def test_layerseries_compat(self): for collection_name, collection_data in self.tc.layer['collections'].items(): - self.assertTrue(collection_data['compat'], "Collection %s from layer %s does not set compatible oe-core versions via LAYERSERIES_COMPAT_collection." \ - % (collection_name, self.tc.layer['name'])) + with self.subTest(collection=collection_name): + self.assertIsNotNone(collection_data['compat'], "Collection %s from layer %s does not set compatible oe-core versions via LAYERSERIES_COMPAT_collection." \ + % (collection_name, self.tc.layer['name'])) |