diff options
author | Anton Antonov <anton.antonov@arm.com> | 2023-04-10 19:33:55 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-04-12 07:45:25 -0400 |
commit | 3b0659d50faceeb8efaef43be5bc86fecaee921c (patch) | |
tree | 4de654d4d248b0e9986550ac60b0e03abdaef738 | |
parent | 9d21e480531dee0cf13f85f272d7738ff54a93d6 (diff) | |
download | meta-security-3b0659d50faceeb8efaef43be5bc86fecaee921c.tar.gz |
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 <Anton.Antonov@arm.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-parsec/lib/oeqa/runtime/cases/parsec.py | 13 |
1 files 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 71061db..66932ed 100644 --- a/meta-parsec/lib/oeqa/runtime/cases/parsec.py +++ b/meta-parsec/lib/oeqa/runtime/cases/parsec.py | |||
@@ -61,9 +61,18 @@ class ParsecTest(OERuntimeTestCase): | |||
61 | 61 | ||
62 | def check_packageconfig(self, prov): | 62 | def check_packageconfig(self, prov): |
63 | """ Check that the require provider is included in Parsec """ | 63 | """ Check that the require provider is included in Parsec """ |
64 | if prov not in self.tc.td['PACKAGECONFIG:pn-parsec-service']: | 64 | |
65 | if 'PACKAGECONFIG:pn-parsec-service' in self.tc.td.keys(): | ||
66 | providers = self.tc.td['PACKAGECONFIG:pn-parsec-service'] | ||
67 | else: | ||
68 | # PACKAGECONFIG is not defined in local.conf | ||
69 | # Let's use the default value | ||
70 | providers = "PKCS11 MBED-CRYPTO" | ||
71 | if 'tpm2' in self.tc.td['DISTRO_FEATURES']: | ||
72 | providers += " TPM" | ||
73 | if prov not in providers: | ||
65 | self.skipTest('%s provider is not included in Parsec. Parsec PACKAGECONFIG: "%s"' % \ | 74 | self.skipTest('%s provider is not included in Parsec. Parsec PACKAGECONFIG: "%s"' % \ |
66 | (prov, self.tc.td['PACKAGECONFIG:pn-parsec-service'])) | 75 | (prov, providers)) |
67 | 76 | ||
68 | def check_packages(self, prov, packages): | 77 | def check_packages(self, prov, packages): |
69 | """ Check for the required packages for Parsec providers software backends """ | 78 | """ Check for the required packages for Parsec providers software backends """ |