tests: subsys: fs: bm_zms: add native_sim board target

* Updates the ztest to include the native_sim board target.

* Fixes some configuration bugs in the test suite.

* Fixes a bug where `bm_zms_clear` was not waited on
  until completion.

Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>

Author: MirkoCovizzi

samples/Kconfig

@@ -8,7 +8,7 @@
 
 # All these samples shall run without multithreading
 config MULTITHREADING
-	default n if !UNITY
+	default n if (!UNITY && !(ZTEST && BOARD_NATIVE_SIM))
 
 # Software ISR table is not needed if multithreading is not used
 config GEN_SW_ISR_TABLE

subsys/fs/bm_zms/bm_zms.c

@@ -29,6 +29,10 @@
 
 LOG_MODULE_REGISTER(bm_zms, CONFIG_BM_ZMS_LOG_LEVEL);
 
+#if CONFIG_ZTEST && NATIVE_SIM
+#define __ALIGN(x) __aligned(x)
+#endif
+
 static zms_op_t cur_op; /* Current bm_zms operation. */
 static zms_op_t *p_cur_op;
 static atomic_t cur_op_result = ATOMIC_INIT(0);

tests/subsys/fs/bm_zms/boards/native_sim.conf

@@ -0,0 +1,2 @@
+CONFIG_BM_STORAGE_BACKEND_NATIVE_SIM=y
+CONFIG_HEAP_MEM_POOL_SIZE=1024

tests/subsys/fs/bm_zms/src/main.c

@@ -13,25 +13,83 @@
 #include <zephyr/sys/crc.h>
 #include <zephyr/ztest.h>
 
+#if CONFIG_NATIVE_SIM
+#include <zephyr/kernel.h>
+#endif
+
 #include <bm/fs/bm_zms.h>
 #include <bm_zms_priv.h>
 
 /* Arbitrary block size. */
-#define SECTOR_SIZE 1024U
-
-#define STORAGE_NODE	     DT_NODELABEL(storage_partition)
+#define TEST_SECTOR_SIZE 1024U
+#define TEST_SECTOR_COUNT 4U
+#define TEST_PARTITION_SIZE (TEST_SECTOR_SIZE * TEST_SECTOR_COUNT)
+#define TEST_DATA_ID 1
+
+#if CONFIG_NATIVE_SIM
+static uint8_t mem[TEST_PARTITION_SIZE];
+#define TEST_PARTITION_START ((off_t)mem)
+#else
+#define STORAGE_NODE DT_NODELABEL(storage_partition)
 #define TEST_PARTITION_START DT_REG_ADDR(STORAGE_NODE)
-#define TEST_PARTITION_SIZE  (SECTOR_SIZE * 4)
-#define TEST_DATA_ID	     1
-#define TEST_SECTOR_COUNT    4U
+#endif
 
 struct bm_zms_fixture {
 	struct bm_zms_fs fs;
 	struct bm_zms_fs_config config;
 };
+
 static bool nvm_is_full;
 
-void bm_zms_test_handler(struct bm_zms_evt const *evt)
+static void wait_for_ongoing_writes(struct bm_zms_fs *fs)
+{
+	while (fs->ongoing_writes) {
+#if CONFIG_NATIVE_SIM
+		k_sleep(K_MSEC(100));
+#elif CONFIG_SOFTDEVICE
+		/* Wait for an event. */
+		__WFE();
+
+		/* Clear Event Register */
+		__SEV();
+		__WFE();
+#endif
+	}
+}
+
+static void wait_for_init(struct bm_zms_fs *fs)
+{
+	while (!fs->init_flags.initialized) {
+#if CONFIG_NATIVE_SIM
+		k_sleep(K_MSEC(100));
+#elif CONFIG_SOFTDEVICE
+		/* Wait for an event. */
+		__WFE();
+
+		/* Clear Event Register */
+		__SEV();
+		__WFE();
+#endif
+	}
+}
+
+static void wait_for_uninit(struct bm_zms_fs *fs)
+{
+	while (fs->init_flags.initialized) {
+#if CONFIG_NATIVE_SIM
+		k_sleep(K_MSEC(100));
+#elif CONFIG_SOFTDEVICE
+		/* Wait for an event. */
+		__WFE();
+
+		/* Clear Event Register */
+		__SEV();
+		__WFE();
+#endif
+	}
+}
+
+void bm_zms_test_evt_handler(struct bm_zms_evt const *evt)
 {
 	if (evt->evt_type == BM_ZMS_EVT_MOUNT) {
 		zassert_true(evt->result == 0, "bm_zms_mount call failure: %d",
@@ -57,9 +115,9 @@ static void *setup(void)
 
 	memset(&fixture, 0, sizeof(struct bm_zms_fixture));
 	fixture.config.offset = TEST_PARTITION_START;
-	fixture.config.sector_size = SECTOR_SIZE;
+	fixture.config.sector_size = TEST_SECTOR_SIZE;
 	fixture.config.sector_count = TEST_SECTOR_COUNT;
-	fixture.config.evt_handler = bm_zms_test_handler;
+	fixture.config.evt_handler = bm_zms_test_evt_handler;
 
 	return &fixture;
 }
@@ -79,37 +137,10 @@ static void after(void *data)
 
 		err = bm_zms_clear(&fixture->fs);
 		zassert_true(err == 0, "zms_clear call failure: %x", err);
+		wait_for_uninit(&fixture->fs);
 	}
 
-	fixture->fs.sector_count = TEST_SECTOR_COUNT;
-}
-
-static void wait_for_ongoing_writes(struct bm_zms_fs *fs)
-{
-	while (fs->ongoing_writes) {
-#if defined(CONFIG_SOFTDEVICE)
-		/* Wait for an event. */
-		__WFE();
-
-		/* Clear Event Register */
-		__SEV();
-		__WFE();
-#endif
-	}
-}
-
-static void wait_for_init(struct bm_zms_fs *fs)
-{
-	while (!fs->init_flags.initialized) {
-#if defined(CONFIG_SOFTDEVICE)
-		/* Wait for an event. */
-		__WFE();
-
-		/* Clear Event Register */
-		__SEV();
-		__WFE();
-#endif
-	}
+	fixture->config.sector_count = TEST_SECTOR_COUNT;
 }
 
 ZTEST_SUITE(bm_zms, NULL, setup, before, after, NULL);
@@ -155,6 +186,8 @@ ZTEST_F(bm_zms, test_bm_zms_write)
 
 	err = bm_zms_mount(&fixture->fs, &fixture->config);
 	zassert_true(err == 0, "zms_mount call failure: %d", err);
+	wait_for_init(&fixture->fs);
+
 	execute_long_pattern_write(TEST_DATA_ID, &fixture->fs);
 }
 
@@ -168,7 +201,7 @@ ZTEST_F(bm_zms, test_zms_gc)
 	/* 21st write will trigger GC. */
 	const uint16_t max_writes = 21;
 
-	fixture->fs.sector_count = 2;
+	fixture->config.sector_count = 2;
 
 	err = bm_zms_mount(&fixture->fs, &fixture->config);
 	wait_for_init(&fixture->fs);
@@ -296,6 +329,7 @@ ZTEST_F(bm_zms, test_zms_gc_3sectors)
 
 	err = bm_zms_mount(&fixture->fs, &fixture->config);
 	zassert_true(err == 0, "bm_zms_mount call failure");
+	wait_for_init(&fixture->fs);
 
 	zassert_equal(fixture->fs.ate_wra >> ADDR_SECT_SHIFT, 0, "unexpected write sector");
 	check_content(max_id, &fixture->fs);
@@ -339,7 +373,7 @@ ZTEST_F(bm_zms, test_zms_full_sector)
 	uint32_t filling_id = 0;
 	uint32_t data_read;
 
-	fixture->fs.sector_count = 3;
+	fixture->config.sector_count = 3;
 
 	err = bm_zms_mount(&fixture->fs, &fixture->config);
 	wait_for_init(&fixture->fs);
@@ -392,7 +426,7 @@ ZTEST_F(bm_zms, test_delete)
 	uint32_t ate_wra;
 	uint32_t data_wra;
 
-	fixture->fs.sector_count = 3;
+	fixture->config.sector_count = 3;
 
 	err = bm_zms_mount(&fixture->fs, &fixture->config);
 	wait_for_init(&fixture->fs);
@@ -466,7 +500,7 @@ ZTEST_F(bm_zms, test_zms_cache_init)
 
 	/* Test cache initialization when the store is empty */
 
-	fixture->fs.sector_count = 3;
+	fixture->config.sector_count = 3;
 	err = bm_zms_mount(&fixture->fs, &fixture->config);
 	wait_for_init(&fixture->fs);
 	zassert_true(err == 0, "bm_zms_mount call failure");
@@ -512,7 +546,7 @@ ZTEST_F(bm_zms, test_zms_cache_collission)
 	int err;
 	uint16_t data;
 
-	fixture->fs.sector_count = 4;
+	fixture->config.sector_count = 4;
 	err = bm_zms_mount(&fixture->fs, &fixture->config);
 	wait_for_init(&fixture->fs);
 	zassert_true(err == 0, "bm_zms_mount call failure");

tests/subsys/fs/bm_zms/testcase.yaml

@@ -1,20 +1,29 @@
 common:
   tags: bm_zms
-  skip: true
   platform_allow:
+    - native_sim
     - bm_nrf54l15dk/nrf54l05/cpuapp/s115_softdevice
     - bm_nrf54l15dk/nrf54l10/cpuapp/s115_softdevice
     - bm_nrf54l15dk/nrf54l15/cpuapp/s115_softdevice
+  integration_platforms:
+    - native_sim
 tests:
   subsys.bm_zms:
     tags: bm_zms
-  subsys.bm_zms.cache:
+  subsys.bm_zms.native_sim.cache:
+    filter: BOARD_NATIVE_SIM
     extra_args:
       - CONFIG_BM_ZMS_LOOKUP_CACHE=y
       - CONFIG_BM_ZMS_LOOKUP_CACHE_SIZE=64
-  subsys.bm_zms.data_crc:
+  subsys.bm_zms.native_sim.data_crc:
+    filter: BOARD_NATIVE_SIM
     extra_args:
       - CONFIG_BM_ZMS_DATA_CRC=y
-  subsys.bm_zms.softdevice:
+  subsys.bm_zms.native_sim.async:
+    filter: BOARD_NATIVE_SIM
+    extra_args:
+      - CONFIG_BM_STORAGE_BACKEND_NATIVE_SIM_ASYNC=y
+  subsys.bm_zms.bm_nrf54l15dk.softdevice:
+    filter: not BOARD_NATIVE_SIM
     extra_args:
       - CONFIG_SOFTDEVICE=y