tests: flash_map: Fix tests configurations

de-nordic · fabiobaltieri · commit e04f6d0e84ee · 2024-11-26T14:44:54.000Z
Kconfig that enables integrity check has been moved to
test configurations that test it.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/tests/subsys/storage/flash_map/CMakeLists.txt b/tests/subsys/storage/flash_map/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(flash_map)
 
-if(NOT CONFIG_FLASH_AREA_CHECK_INTEGRITY_PSA AND NOT CONFIG_FLASH_AREA_CHECK_INTEGRITY_MBEDTLS)
+if(NOT CONFIG_FLASH_AREA_CHECK_INTEGRITY)
   FILE(GLOB app_sources src/main.c)
 else()
   FILE(GLOB app_sources src/main_sha.c)
diff --git a/tests/subsys/storage/flash_map/overlay-mbedtls.conf b/tests/subsys/storage/flash_map/overlay-mbedtls.conf
@@ -1 +1,2 @@
+CONFIG_FLASH_AREA_CHECK_INTEGRITY=y
 CONFIG_FLASH_AREA_CHECK_INTEGRITY_MBEDTLS=y
diff --git a/tests/subsys/storage/flash_map/overlay-psa.conf b/tests/subsys/storage/flash_map/overlay-psa.conf
@@ -1,3 +1,4 @@
+CONFIG_FLASH_AREA_CHECK_INTEGRITY=y
 CONFIG_FLASH_AREA_CHECK_INTEGRITY_PSA=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
diff --git a/tests/subsys/storage/flash_map/prj.conf b/tests/subsys/storage/flash_map/prj.conf
@@ -3,4 +3,3 @@ CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-CONFIG_FLASH_AREA_CHECK_INTEGRITY=y

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+CONFIG_FLASH_AREA_CHECK_INTEGRITY=y`
`1`	`2`	`CONFIG_FLASH_AREA_CHECK_INTEGRITY_MBEDTLS=y`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+CONFIG_FLASH_AREA_CHECK_INTEGRITY=y`
`1`	`2`	`CONFIG_FLASH_AREA_CHECK_INTEGRITY_PSA=y`
`2`	`3`	`CONFIG_MBEDTLS=y`
`3`	`4`	`CONFIG_MBEDTLS_PSA_CRYPTO_C=y`