[nrf fromlist] secure_storage: improve tests' compatibility in TF-M-enabled scenarios

tomi-font · tomi-font · commit f86c321b224d · 2025-02-13T16:34:17.000+02:00
Explicitly set the TF-M profile to not rely on the build system defaults
which might differ.

Signed-off-by: Tomi Fontanilles &lt;tomi.fontanilles@nordicsemi.no&gt;
(cherry picked from commit 6e055a26c347ceba5804ef7f22aa490305d8b217)
Signed-off-by: Tomi Fontanilles &lt;tomi.fontanilles@nordicsemi.no&gt;
diff --git a/samples/psa/its/overlay-tfm.conf b/samples/psa/its/overlay-tfm.conf
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/samples/psa/its/sample.yaml b/samples/psa/its/sample.yaml
@@ -13,6 +13,7 @@ common:
 tests:
   sample.psa.its.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     tags:
       - trusted-firmware-m
   sample.psa.its.secure_storage.entropy_driver:
@@ -25,7 +26,7 @@ tests:
   sample.psa.its.secure_storage.entropy_not_secure:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             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:
       - random
       - settings
diff --git a/samples/psa/persistent_key/overlay-tfm.conf b/samples/psa/persistent_key/overlay-tfm.conf
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/samples/psa/persistent_key/sample.yaml b/samples/psa/persistent_key/sample.yaml
@@ -13,6 +13,7 @@ common:
 tests:
   sample.psa.persistent_key.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     tags:
       - trusted-firmware-m
   sample.psa.persistent_key.secure_storage.entropy_driver:
@@ -25,7 +26,7 @@ tests:
   sample.psa.persistent_key.secure_storage.entropy_not_secure:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             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:
       - random
       - settings
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
@@ -0,0 +1 @@
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/tests/subsys/secure_storage/psa/crypto/testcase.yaml b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
@@ -9,6 +9,7 @@ tests:
       - native_sim
       - nrf54l15dk/nrf54l15/cpuapp
   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:
       - nrf9151dk/nrf9151/ns
diff --git a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
@@ -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=256

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# SPDX-License-Identifier: Apache-2.0`
	`2`	`+`
	`3`	`+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y`