From e04f6d0e84eeb0d61a214412ea21b6e8b8569f79 Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Wed, 20 Nov 2024 09:12:57 +0000 Subject: [PATCH] tests: flash_map: Fix tests configurations Kconfig that enables integrity check has been moved to test configurations that test it. Signed-off-by: Dominik Ermel --- tests/subsys/storage/flash_map/CMakeLists.txt | 2 +- tests/subsys/storage/flash_map/overlay-mbedtls.conf | 1 + tests/subsys/storage/flash_map/overlay-psa.conf | 1 + tests/subsys/storage/flash_map/prj.conf | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/subsys/storage/flash_map/CMakeLists.txt b/tests/subsys/storage/flash_map/CMakeLists.txt index 8c0287e6f17..3e01bee8488 100644 --- 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 index 0d18fba5d3b..2b8aef9e908 100644 --- 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 index e70359a2d54..03d88c4b530 100644 --- 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 index 94f9b8b4e0f..4623d5b1da1 100644 --- 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