diff --git a/tests/subsys/secure_storage/psa/its/overlay-default_store.conf b/tests/subsys/secure_storage/psa/its/overlay-default_store.conf deleted file mode 100644 index 584a2d08feb..00000000000 --- a/tests/subsys/secure_storage/psa/its/overlay-default_store.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Limit the space available for the maximum entry test to not take too long. -CONFIG_SETTINGS_NVS_SECTOR_COUNT=2 diff --git a/tests/subsys/secure_storage/psa/its/overlay-custom_store.conf b/tests/subsys/secure_storage/psa/its/overlay-store_custom.conf similarity index 100% rename from tests/subsys/secure_storage/psa/its/overlay-custom_store.conf rename to tests/subsys/secure_storage/psa/its/overlay-store_custom.conf diff --git a/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf b/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf new file mode 100644 index 00000000000..e6604bc94b0 --- /dev/null +++ b/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf @@ -0,0 +1,7 @@ +CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y + +# 256 - flags (1) - CONFIG_SECURE_STORAGE_ITS_TRANSFORM_OUTPUT_OVERHEAD (28) +CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=227 + +# Limit the space available for the maximum entry test to not take too long with NVS. +CONFIG_SETTINGS_NVS_SECTOR_COUNT=2 diff --git a/tests/subsys/secure_storage/psa/its/overlay-custom_transform.conf b/tests/subsys/secure_storage/psa/its/overlay-transform_custom.conf similarity index 57% rename from tests/subsys/secure_storage/psa/its/overlay-custom_transform.conf rename to tests/subsys/secure_storage/psa/its/overlay-transform_custom.conf index 8a95663d98a..2d845b7321b 100644 --- a/tests/subsys/secure_storage/psa/its/overlay-custom_transform.conf +++ b/tests/subsys/secure_storage/psa/its/overlay-transform_custom.conf @@ -1,5 +1,4 @@ CONFIG_SECURE_STORAGE_ITS_TRANSFORM_IMPLEMENTATION_CUSTOM=y CONFIG_SECURE_STORAGE_ITS_TRANSFORM_OUTPUT_OVERHEAD=0 -# SETTINGS_MAX_VAL_LEN (256) - flags (1) -CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=255 +CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=500 diff --git a/tests/subsys/secure_storage/psa/its/overlay-default_transform.conf b/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf similarity index 60% rename from tests/subsys/secure_storage/psa/its/overlay-default_transform.conf rename to tests/subsys/secure_storage/psa/its/overlay-transform_default.conf index dd304107309..c743a735e4d 100644 --- a/tests/subsys/secure_storage/psa/its/overlay-default_transform.conf +++ b/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf @@ -5,5 +5,4 @@ CONFIG_TIMER_RANDOM_GENERATOR=y CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=2048 CONFIG_MBEDTLS_PSA_CRYPTO_C=y -# SETTINGS_MAX_VAL_LEN (256) - flags (1) - CONFIG_SECURE_STORAGE_ITS_TRANSFORM_OUTPUT_OVERHEAD (28) -CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=227 +CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=300 diff --git a/tests/subsys/secure_storage/psa/its/testcase.yaml b/tests/subsys/secure_storage/psa/its/testcase.yaml index c59c58532b4..b3dce34dd18 100644 --- a/tests/subsys/secure_storage/psa/its/testcase.yaml +++ b/tests/subsys/secure_storage/psa/its/testcase.yaml @@ -1,42 +1,45 @@ common: integration_platforms: - native_sim + - nrf54l15dk/nrf54l15/cpuapp platform_exclude: - qemu_cortex_m0 # settings subsystem initialization fails timeout: 600 tags: - psa.secure_storage tests: - secure_storage.psa.its.secure_storage: - filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE + secure_storage.psa.its.secure_storage.zms: + # DT-based filtering is not possible for this test scenario. + # Platforms with a storage_partition must be manually added here. + platform_allow: native_sim mps2/an385 qemu_x86/atom qemu_x86_64/atom + nrf54l15dk/nrf54l15/cpuapp nrf5340dk/nrf5340/cpuapp nrf52840dk/nrf52840 + nrf9151dk/nrf9151 nrf9160dk/nrf9160 nrf9161dk/nrf9161 + extra_args: + - EXTRA_DTC_OVERLAY_FILE=zms.overlay + - EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-transform_default.conf + - CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS=y + + secure_storage.psa.its.secure_storage.settings.nvs: + filter: CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS extra_args: "EXTRA_CONF_FILE=\ - overlay-secure_storage.conf;overlay-default_transform.conf;overlay-default_store.conf" - integration_platforms: - - native_sim - - nrf54l15dk/nrf54l15/cpuapp + overlay-secure_storage.conf;overlay-transform_default.conf;overlay-store_settings.conf" + secure_storage.psa.its.secure_storage.custom.transform: filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE - extra_args: "EXTRA_CONF_FILE=\ - overlay-secure_storage.conf;overlay-custom_transform.conf;overlay-default_store.conf" - integration_platforms: - - native_sim - - nrf54l15dk/nrf54l15/cpuapp + extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-transform_custom.conf + secure_storage.psa.its.secure_storage.custom.store: filter: CONFIG_SECURE_STORAGE extra_args: "EXTRA_CONF_FILE=\ - overlay-secure_storage.conf;overlay-default_transform.conf;overlay-custom_store.conf" - integration_platforms: - - native_sim - - nrf54l15dk/nrf54l15/cpuapp + overlay-secure_storage.conf;overlay-transform_default.conf;overlay-store_custom.conf" + secure_storage.psa.its.secure_storage.custom.both: filter: CONFIG_SECURE_STORAGE extra_args: "EXTRA_CONF_FILE=\ - overlay-secure_storage.conf;overlay-custom_transform.conf;overlay-custom_store.conf" - integration_platforms: - - native_sim - - nrf54l15dk/nrf54l15/cpuapp + overlay-secure_storage.conf;overlay-transform_custom.conf;overlay-store_custom.conf" + secure_storage.psa.its.tfm: filter: CONFIG_BUILD_WITH_TFM - extra_args: EXTRA_CONF_FILE=overlay-tfm.conf integration_platforms: - nrf9151dk/nrf9151/ns + extra_args: EXTRA_CONF_FILE=overlay-tfm.conf diff --git a/tests/subsys/secure_storage/psa/its/zms.overlay b/tests/subsys/secure_storage/psa/its/zms.overlay new file mode 100644 index 00000000000..6a739db514c --- /dev/null +++ b/tests/subsys/secure_storage/psa/its/zms.overlay @@ -0,0 +1,5 @@ +/ { + chosen { + secure_storage_its_partition = &storage_partition; + }; +};