From d10f6f9ae37b79a987ffa4ace980b6dfab158729 Mon Sep 17 00:00:00 2001 From: Anton Antonov Date: Wed, 12 Apr 2023 16:05:52 +0100 Subject: Fix PACKAGECONFIG check in Parsec OEQA tests If PACKAGECONFIG is not defined in local.conf then its default value is not included in cls.tc.td map. Signed-off-by: Anton Antonov Signed-off-by: Armin Kuster --- meta-parsec/lib/oeqa/runtime/cases/parsec.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta-parsec/lib/oeqa/runtime/cases/parsec.py b/meta-parsec/lib/oeqa/runtime/cases/parsec.py index 9df5bec..3729863 100644 --- a/meta-parsec/lib/oeqa/runtime/cases/parsec.py +++ b/meta-parsec/lib/oeqa/runtime/cases/parsec.py @@ -65,9 +65,18 @@ class ParsecTest(OERuntimeTestCase): def check_packageconfig(self, prov): """ Check that the require provider is included in Parsec """ - if prov not in self.tc.td['PACKAGECONFIG:pn-parsec-service']: + + if 'PACKAGECONFIG:pn-parsec-service' in self.tc.td.keys(): + providers = self.tc.td['PACKAGECONFIG:pn-parsec-service'] + else: + # PACKAGECONFIG is not defined in local.conf + # Let's use the default value + providers = "PKCS11 MBED-CRYPTO" + if 'tpm2' in self.tc.td['DISTRO_FEATURES']: + providers += " TPM" + if prov not in providers: self.skipTest('%s provider is not included in Parsec. Parsec PACKAGECONFIG: "%s"' % \ - (prov, self.tc.td['PACKAGECONFIG:pn-parsec-service'])) + (prov, providers)) def check_packages(self, prov, packages): """ Check for the required packages for Parsec providers software backends """ -- cgit v1.2.3-54-g00ecf