michaelh/zephyr
1
0
Fork 0
Code Releases Activity

secure_storage: improve tests' compatibility in TF-M-enabled scenarios

Browse source 
Explicitly set the TF-M profile to not rely on the build system defaults
which might differ.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
This commit is contained in:
Tomi Fontanilles 2025-02-13 16:18:58 +02:00 • committed by Benjamin Cabé
commit 62fe34dd02
7 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
samples/psa/its/overlay-tfm.conf Normal file
View file

@ -0,0 +1,3 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_TFM_PROFILE_TYPE_NOT_SET=y

3
samples/psa/its/sample.yaml
View file

@ -13,6 +13,7 @@ common:
tests: tests:
sample.psa.its.tfm: sample.psa.its.tfm:
filter: CONFIG_BUILD_WITH_TFM filter: CONFIG_BUILD_WITH_TFM
extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
tags: tags:
- trusted-firmware-m - trusted-firmware-m
sample.psa.its.secure_storage.entropy_driver: sample.psa.its.secure_storage.entropy_driver:
@ -25,7 +26,7 @@ tests:
sample.psa.its.secure_storage.entropy_not_secure: sample.psa.its.secure_storage.entropy_not_secure:
filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
and not CONFIG_ENTROPY_HAS_DRIVER and not CONFIG_ENTROPY_HAS_DRIVER
extra_args: EXTRA_CONF_FILE="overlay-secure_storage.conf;overlay-entropy_not_secure.conf" extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_not_secure.conf
tags: tags:
- random - random
- settings - settings

3
samples/psa/persistent_key/overlay-tfm.conf Normal file
View file

@ -0,0 +1,3 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_TFM_PROFILE_TYPE_NOT_SET=y

3
samples/psa/persistent_key/sample.yaml
View file

@ -13,6 +13,7 @@ common:
tests: tests:
sample.psa.persistent_key.tfm: sample.psa.persistent_key.tfm:
filter: CONFIG_BUILD_WITH_TFM filter: CONFIG_BUILD_WITH_TFM
extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
tags: tags:
- trusted-firmware-m - trusted-firmware-m
sample.psa.persistent_key.secure_storage.entropy_driver: sample.psa.persistent_key.secure_storage.entropy_driver:
@ -25,7 +26,7 @@ tests:
sample.psa.persistent_key.secure_storage.entropy_not_secure: sample.psa.persistent_key.secure_storage.entropy_not_secure:
filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
and not CONFIG_ENTROPY_HAS_DRIVER and not CONFIG_ENTROPY_HAS_DRIVER
extra_args: EXTRA_CONF_FILE="overlay-secure_storage.conf;overlay-entropy_not_secure.conf" extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_not_secure.conf
tags: tags:
- random - random
- settings - settings

1
tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf Normal file
View file

@ -0,0 +1 @@
CONFIG_TFM_PROFILE_TYPE_NOT_SET=y

3
tests/subsys/secure_storage/psa/crypto/testcase.yaml
View file

@ -9,6 +9,7 @@ tests:
- native_sim - native_sim
- nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp
secure_storage.psa.crypto.tfm: secure_storage.psa.crypto.tfm:
filter: CONFIG_BUILD_WITH_TFM and not CONFIG_TFM_PROFILE_TYPE_SMALL filter: CONFIG_BUILD_WITH_TFM
extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
integration_platforms: integration_platforms:
- nrf9151dk/nrf9151/ns - nrf9151dk/nrf9151/ns

2
tests/subsys/secure_storage/psa/its/overlay-tfm.conf
View file

@ -1,2 +1,4 @@
CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
CONFIG_TFM_ITS_MAX_ASSET_SIZE_OVERRIDE=y CONFIG_TFM_ITS_MAX_ASSET_SIZE_OVERRIDE=y
CONFIG_TFM_ITS_MAX_ASSET_SIZE=256 CONFIG_TFM_ITS_MAX_ASSET_SIZE=256