From 967818f6414ba0a3587a7bf2ba60c3208fc0aced Mon Sep 17 00:00:00 2001 From: Jordan Yates Date: Mon, 24 Feb 2025 20:20:12 +1000 Subject: [PATCH] tests: secure_storage: add dependencies Now that `SECURE_STORAGE` does not `select` dependencies, they need to be enabled explicitly by the tests. Signed-off-by: Jordan Yates --- samples/psa/its/overlay-secure_storage.conf | 6 ++++++ samples/psa/persistent_key/overlay-secure_storage.conf | 6 ++++++ .../secure_storage/psa/crypto/overlay-secure_storage.conf | 6 ++++++ ...erlay-store_default.conf => overlay-store_settings.conf} | 5 +++++ tests/subsys/secure_storage/psa/its/overlay-store_zms.conf | 3 +++ tests/subsys/secure_storage/psa/its/testcase.yaml | 6 +++--- 6 files changed, 29 insertions(+), 3 deletions(-) rename tests/subsys/secure_storage/psa/its/{overlay-store_default.conf => overlay-store_settings.conf} (77%) create mode 100644 tests/subsys/secure_storage/psa/its/overlay-store_zms.conf diff --git a/samples/psa/its/overlay-secure_storage.conf b/samples/psa/its/overlay-secure_storage.conf index 3473ae389101..9265b38ccc7c 100644 --- a/samples/psa/its/overlay-secure_storage.conf +++ b/samples/psa/its/overlay-secure_storage.conf @@ -8,3 +8,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_MAIN_STACK_SIZE=3072 CONFIG_SECURE_STORAGE=y +CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y +CONFIG_SETTINGS=y +CONFIG_SETTINGS_NVS=y +CONFIG_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_MAP=y diff --git a/samples/psa/persistent_key/overlay-secure_storage.conf b/samples/psa/persistent_key/overlay-secure_storage.conf index 3473ae389101..9265b38ccc7c 100644 --- a/samples/psa/persistent_key/overlay-secure_storage.conf +++ b/samples/psa/persistent_key/overlay-secure_storage.conf @@ -8,3 +8,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_MAIN_STACK_SIZE=3072 CONFIG_SECURE_STORAGE=y +CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y +CONFIG_SETTINGS=y +CONFIG_SETTINGS_NVS=y +CONFIG_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_MAP=y diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf index ed84c3043288..b67ceff8969b 100644 --- a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf +++ b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf @@ -12,3 +12,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_SECURE_STORAGE=y # For testing isolation between the different callers of the ITS. CONFIG_SECURE_STORAGE_PS_IMPLEMENTATION_ITS=y +CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y +CONFIG_SETTINGS=y +CONFIG_SETTINGS_NVS=y +CONFIG_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_MAP=y diff --git a/tests/subsys/secure_storage/psa/its/overlay-store_default.conf b/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf similarity index 77% rename from tests/subsys/secure_storage/psa/its/overlay-store_default.conf rename to tests/subsys/secure_storage/psa/its/overlay-store_settings.conf index e6604bc94b01..b0a2cd493f9d 100644 --- a/tests/subsys/secure_storage/psa/its/overlay-store_default.conf +++ b/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf @@ -1,4 +1,9 @@ CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y +CONFIG_SETTINGS=y +CONFIG_SETTINGS_NVS=y +CONFIG_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_MAP=y # 256 - flags (1) - CONFIG_SECURE_STORAGE_ITS_TRANSFORM_OUTPUT_OVERHEAD (28) CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=227 diff --git a/tests/subsys/secure_storage/psa/its/overlay-store_zms.conf b/tests/subsys/secure_storage/psa/its/overlay-store_zms.conf new file mode 100644 index 000000000000..7efe611bc0a4 --- /dev/null +++ b/tests/subsys/secure_storage/psa/its/overlay-store_zms.conf @@ -0,0 +1,3 @@ +CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS=y +CONFIG_ZMS=y +CONFIG_FLASH=y diff --git a/tests/subsys/secure_storage/psa/its/testcase.yaml b/tests/subsys/secure_storage/psa/its/testcase.yaml index bf72516e4b24..d84a14dad84d 100644 --- a/tests/subsys/secure_storage/psa/its/testcase.yaml +++ b/tests/subsys/secure_storage/psa/its/testcase.yaml @@ -25,17 +25,17 @@ tests: - nrf9161dk/nrf9161 extra_args: - EXTRA_DTC_OVERLAY_FILE=zms.overlay - - EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-transform_default.conf + - EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-store_zms.conf;overlay-transform_default.conf secure_storage.psa.its.secure_storage.store.settings: filter: CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS extra_args: "EXTRA_CONF_FILE=\ - overlay-secure_storage.conf;overlay-transform_default.conf;overlay-store_default.conf" + 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-transform_custom.conf;overlay-store_default.conf" + overlay-secure_storage.conf;overlay-transform_custom.conf;overlay-store_settings.conf" secure_storage.psa.its.secure_storage.custom.store: filter: CONFIG_SECURE_STORAGE