From 8a4a2231deab0eef8cb57da4d72fec00358eabf9 Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Wed, 18 Dec 2024 09:36:57 +0100 Subject: [PATCH] tests: move mfg storage test Tests skipped - to be rewritten Signed-off-by: Krzysztof Taborowski --- tests/functional/mfg_storage/testcase.yaml | 29 ------------------- .../integration/mfg}/CMakeLists.txt | 2 +- .../integration/mfg}/Kconfig | 11 +++---- .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 14 +++++++++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 0 .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 0 tests_new/integration/mfg/pm_static.yml | 4 +++ .../pm_static_nrf54l15dk_nrf54l10_cpuapp.yml | 4 +++ .../pm_static_nrf54l15dk_nrf54l15_cpuapp.yml | 0 ...m_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml | 0 .../integration/mfg}/prj.conf | 1 - .../integration/mfg}/src/main.c | 5 ---- tests_new/integration/mfg/testcase.yaml | 16 ++++++++++ 13 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 tests/functional/mfg_storage/testcase.yaml rename {tests/functional/mfg_storage => tests_new/integration/mfg}/CMakeLists.txt (90%) rename {tests/functional/mfg_storage => tests_new/integration/mfg}/Kconfig (87%) create mode 100644 tests_new/integration/mfg/boards/nrf54l15dk_nrf54l10_cpuapp.overlay rename {tests/functional/mfg_storage => tests_new/integration/mfg}/boards/nrf54l15dk_nrf54l15_cpuapp.overlay (100%) rename {tests/functional/mfg_storage => tests_new/integration/mfg}/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay (100%) create mode 100644 tests_new/integration/mfg/pm_static.yml create mode 100644 tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml rename {tests/functional/mfg_storage => tests_new/integration/mfg}/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml (100%) rename {tests/functional/mfg_storage => tests_new/integration/mfg}/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml (100%) rename {tests/functional/mfg_storage => tests_new/integration/mfg}/prj.conf (99%) rename {tests/functional/mfg_storage => tests_new/integration/mfg}/src/main.c (98%) create mode 100644 tests_new/integration/mfg/testcase.yaml diff --git a/tests/functional/mfg_storage/testcase.yaml b/tests/functional/mfg_storage/testcase.yaml deleted file mode 100644 index f0b454d391..0000000000 --- a/tests/functional/mfg_storage/testcase.yaml +++ /dev/null @@ -1,29 +0,0 @@ -tests: - sidewalk.test.integration.mfg_storage: - skip: true - sysbuild: true - tags: Sidewalk - platform_allow: - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf54l15dk/nrf54l15/cpuapp - - nrf54l15dk/nrf54l15/cpuapp/ns - - nrf54l15dk/nrf54l10/cpuapp - integration_platforms: - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf54l15dk/nrf54l15/cpuapp - - nrf54l15dk/nrf54l15/cpuapp/ns - - nrf54l15dk/nrf54l10/cpuapp - - sidewalk.test.integration.mfg_storage_deprecated: - skip: true - sysbuild: true - tags: Sidewalk - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15dk/nrf54l15/cpuapp - integration_platforms: - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf54l15dk/nrf54l15/cpuapp - extra_configs: - - CONFIG_DEPRECATED_SIDEWALK_MFG_STORAGE=y diff --git a/tests/functional/mfg_storage/CMakeLists.txt b/tests_new/integration/mfg/CMakeLists.txt similarity index 90% rename from tests/functional/mfg_storage/CMakeLists.txt rename to tests_new/integration/mfg/CMakeLists.txt index a908c40594..b95e88c5c1 100644 --- a/tests/functional/mfg_storage/CMakeLists.txt +++ b/tests_new/integration/mfg/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(sidewalk_functional_test) +project(sidewalk_mfg_test) # add test file FILE(GLOB app_sources src/*.c) diff --git a/tests/functional/mfg_storage/Kconfig b/tests_new/integration/mfg/Kconfig similarity index 87% rename from tests/functional/mfg_storage/Kconfig rename to tests_new/integration/mfg/Kconfig index 0a28c57745..e01359cf6c 100644 --- a/tests/functional/mfg_storage/Kconfig +++ b/tests_new/integration/mfg/Kconfig @@ -7,13 +7,6 @@ config SIDEWALK_BUILD default y config SIDEWALK_MFG_STORAGE - imply FLASH - default y - -config SIDEWALK_LOG_LEVEL - default 0 - -config SHELL default y config SIDEWALK_MFG_STORAGE_DIAGNOSTIC @@ -28,4 +21,8 @@ config SIDEWALK_TLV_FLASH config SIDEWALK_TLV_RAM default y +config SIDEWALK_LOG_LEVEL + default 0 + source "Kconfig.zephyr" +source "${ZEPHYR_BASE}/../sidewalk/Kconfig.dependencies" diff --git a/tests_new/integration/mfg/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/tests_new/integration/mfg/boards/nrf54l15dk_nrf54l10_cpuapp.overlay new file mode 100644 index 0000000000..e5d21541b8 --- /dev/null +++ b/tests_new/integration/mfg/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1024)>; +}; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(192)>; + ranges = <0x0 0x20000000 DT_SIZE_K(192)>; +}; diff --git a/tests/functional/mfg_storage/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests_new/integration/mfg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay similarity index 100% rename from tests/functional/mfg_storage/boards/nrf54l15dk_nrf54l15_cpuapp.overlay rename to tests_new/integration/mfg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay diff --git a/tests/functional/mfg_storage/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/tests_new/integration/mfg/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay similarity index 100% rename from tests/functional/mfg_storage/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay rename to tests_new/integration/mfg/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay diff --git a/tests_new/integration/mfg/pm_static.yml b/tests_new/integration/mfg/pm_static.yml new file mode 100644 index 0000000000..38e6c17c13 --- /dev/null +++ b/tests_new/integration/mfg/pm_static.yml @@ -0,0 +1,4 @@ +mfg_storage: + address: 0xff000 + region: flash_primary + size: 0x1000 diff --git a/tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml b/tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml new file mode 100644 index 0000000000..38e6c17c13 --- /dev/null +++ b/tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml @@ -0,0 +1,4 @@ +mfg_storage: + address: 0xff000 + region: flash_primary + size: 0x1000 diff --git a/tests/functional/mfg_storage/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml b/tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml similarity index 100% rename from tests/functional/mfg_storage/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml rename to tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml diff --git a/tests/functional/mfg_storage/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml b/tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml similarity index 100% rename from tests/functional/mfg_storage/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml rename to tests_new/integration/mfg/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml diff --git a/tests/functional/mfg_storage/prj.conf b/tests_new/integration/mfg/prj.conf similarity index 99% rename from tests/functional/mfg_storage/prj.conf rename to tests_new/integration/mfg/prj.conf index 718ae4c500..bca7c1d7cc 100644 --- a/tests/functional/mfg_storage/prj.conf +++ b/tests_new/integration/mfg/prj.conf @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # - CONFIG_ZTEST=y CONFIG_MAIN_THREAD_PRIORITY=14 CONFIG_PARTITION_MANAGER_ENABLED=y diff --git a/tests/functional/mfg_storage/src/main.c b/tests_new/integration/mfg/src/main.c similarity index 98% rename from tests/functional/mfg_storage/src/main.c rename to tests_new/integration/mfg/src/main.c index 3ef52c0c62..fa36abd450 100644 --- a/tests/functional/mfg_storage/src/main.c +++ b/tests_new/integration/mfg/src/main.c @@ -188,9 +188,4 @@ ZTEST(mfg_storage, test_7sid_pal_mfg_storage_sn_get) zassert_mem_equal(fake_serial_num, serial_num, SID_PAL_MFG_STORE_SERIAL_NUM_SIZE); } -ZTEST(mfg_storage, test_sanity) -{ - zassert_equal(true, true); -} - ZTEST_SUITE(mfg_storage, NULL, NULL, NULL, NULL, NULL); diff --git a/tests_new/integration/mfg/testcase.yaml b/tests_new/integration/mfg/testcase.yaml new file mode 100644 index 0000000000..dc1bf3b615 --- /dev/null +++ b/tests_new/integration/mfg/testcase.yaml @@ -0,0 +1,16 @@ +tests: + sidewalk.test.integration.mfg: + sysbuild: true + tags: Sidewalk + platform_allow: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54l15dk/nrf54l10/cpuapp + integration_platforms: + - nrf52840dk/nrf52840 + - nrf5340dk/nrf5340/cpuapp + - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54l15dk/nrf54l10/cpuapp