From 798c0a8257052a1c5478948047ddfa727c310112 Mon Sep 17 00:00:00 2001 From: Gyorgy Szing Date: Mon, 29 Apr 2024 17:26:52 +0200 Subject: [PATCH] arm/trusted-services: fix oeqa script trusted_services.py:test_15_crypto_service runs ts-service test with an incorrect argument list. The -g argument does not accept two group names. This resulted in a silent failure. Fix this by relying the pattern matching capability of the argument. Additionaly remove references to OP-TEE from test messages as TS tests are SPMC agonistic. Signed-off-by: Gyorgy Szing Signed-off-by: Jon Mason --- .../lib/oeqa/runtime/cases/trusted_services.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/meta-arm/lib/oeqa/runtime/cases/trusted_services.py b/meta-arm/lib/oeqa/runtime/cases/trusted_services.py index e6a840a9..54423999 100644 --- a/meta-arm/lib/oeqa/runtime/cases/trusted_services.py +++ b/meta-arm/lib/oeqa/runtime/cases/trusted_services.py @@ -75,7 +75,7 @@ class TrustedServicesTest(OERuntimeTestCase): def test_11_ps_service_tests(self): if 'ts-storage' not in self.tc.td['MACHINE_FEATURES'] and \ 'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']: - self.skipTest('Storage SP is not included into OPTEE') + self.skipTest('Storage SP is not deployed in the system.') self.run_test_tool('ts-service-test -g PsServiceTests') @OEHasPackage(['ts-service-test']) @@ -83,7 +83,7 @@ class TrustedServicesTest(OERuntimeTestCase): def test_12_its_service_tests(self): if 'ts-its' not in self.tc.td['MACHINE_FEATURES'] and \ 'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']: - self.skipTest('Internal Storage SP is not included into OPTEE') + self.skipTest('Internal Storage SP is not deployed in the system.') self.run_test_tool('ts-service-test -g ItsServiceTests') @OEHasPackage(['ts-service-test']) @@ -91,9 +91,8 @@ class TrustedServicesTest(OERuntimeTestCase): def test_14_attestation_service_tests(self): if 'ts-attestation' not in self.tc.td['MACHINE_FEATURES'] and \ 'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']: - self.skipTest('Attestation SP is not included into OPTEE') - for grp in ["AttestationProvisioningTests", "AttestationServiceTests"]: - self.run_test_tool('ts-service-test -g %s'%grp) + self.skipTest('Attestation SP is not deployed in the system.') + self.run_test_tool('ts-service-test -g Attestation') @OEHasPackage(['ts-service-test']) @skipIfNotInDataVar('MACHINE_FEATURES', 'ts-crypto', 'Crypto SP is not included') @@ -101,8 +100,5 @@ class TrustedServicesTest(OERuntimeTestCase): def test_15_crypto_service_tests(self): if 'ts-crypto' not in self.tc.td['MACHINE_FEATURES'] and \ 'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']: - self.skipTest('Crypto SP is not included into OPTEE') - for grp in ["CryptoKeyDerivationServicePackedcTests", "CryptoMacServicePackedcTests", \ - "CryptoCipherServicePackedcTests", "CryptoHashServicePackedcTests", \ - "CryptoServicePackedcTests", "CryptoServiceProtobufTests CryptoServiceLimitTests"]: - self.run_test_tool('ts-service-test -g %s'%grp) + self.skipTest('Crypto SP is not deployed in the system.') + self.run_test_tool('ts-service-test -g Crypto')