tests: settings: Reducing duplicated code in FS tests

Common code has been moved out of FS specific source into common
source files.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

tests/subsys/settings/fs/include/settings_test_fs.h

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _SETTINGS_TEST_FS_H
+#define _SETTINGS_TEST_FS_H
+
+#include <stdio.h>
+#include <string.h>
+#include <ztest.h>
+#include <fs/fs.h>
+
+#include "settings/settings.h"
+
+#ifdef __cplusplus
+#extern "C" {
+#endif
+
+extern u8_t val8;
+extern u16_t val16;
+extern u32_t val32;
+extern u64_t val64;
+
+extern int test_get_called;
+extern int test_set_called;
+extern int test_commit_called;
+extern int test_export_block;
+
+extern int c2_var_count;
+
+extern struct settings_handler c_test_handlers[];
+
+void ctest_clear_call_state(void);
+int ctest_get_call_state(void);
+
+void config_wipe_srcs(void);
+
+int fsutil_read_file(const char *path, off_t offset, size_t len, void *dst,
+		     size_t *out_len);
+int fsutil_write_file(const char *path, const void *data, size_t len);
+int settings_test_file_strstr(const char *fname, char const *string,
+			      size_t str_len);
+
+
+void config_empty_lookups(void);
+void test_config_insert(void);
+void test_config_getset_unknown(void);
+void test_config_getset_int(void);
+void test_config_getset_int64(void);
+void test_config_commit(void);
+
+void test_config_empty_file(void);
+void test_config_small_file(void);
+void test_config_multiple_in_file(void);
+void test_config_save_in_file(void);
+void test_config_save_one_file(void);
+void test_config_compress_file(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SETTINGS_TEST_FS_H */

tests/subsys/settings/fs/src/settings_test_fs.c

@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdlib.h>
+#include <string.h>
+
+#include "settings_test.h"
+#include "settings_priv.h"
+
+
+u8_t val8;
+u16_t val16;
+u64_t val64;
+
+int test_get_called;
+int test_set_called;
+int test_commit_called;
+int test_export_block;
+
+int c2_var_count = 1;
+
+int c1_handle_get(const char *name, char *val, int val_len_max);
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb,
+		  void *cb_arg);
+int c1_handle_commit(void);
+int c1_handle_export(int (*cb)(const char *name,
+			       const void *value, size_t val_len));
+
+struct settings_handler c_test_handlers[] = {
+	{
+		.name = "myfoo",
+		.h_get = c1_handle_get,
+		.h_set = c1_handle_set,
+		.h_commit = c1_handle_commit,
+		.h_export = c1_handle_export
+	},
+};
+
+
+
+int c1_handle_get(const char *name, char *val, int val_len_max)
+{
+	test_get_called = 1;
+	const char *next;
+
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val8));
+		memcpy(val, &val8, MIN(val_len_max, sizeof(val8)));
+		return val_len_max;
+	}
+
+	if (settings_name_steq(name, "mybar16", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val16));
+		memcpy(val, &val16, MIN(val_len_max, sizeof(val16)));
+		return val_len_max;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val64));
+		memcpy(val, &val64, MIN(val_len_max, sizeof(val64)));
+		return val_len_max;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb,
+		  void *cb_arg)
+{
+	int rc;
+	const char *next;
+	size_t val_len;
+
+	test_set_called = 1;
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		val_len = len;
+		zassert_true(val_len == 1, "bad set-value size");
+
+		rc = read_cb(cb_arg, &val8, sizeof(val8));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "mybar16", &next) && !next) {
+		val_len = len;
+		zassert_true(val_len == 2, "bad set-value size");
+
+		rc = read_cb(cb_arg, &val16, sizeof(val16));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		val_len = len;
+		zassert_true(val_len == 8, "bad set-value size");
+
+		rc = read_cb(cb_arg, &val64, sizeof(val64));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_commit(void)
+{
+	test_commit_called = 1;
+	return 0;
+}
+
+int c1_handle_export(int (*cb)(const char *name,
+			       const void *value, size_t val_len))
+{
+	if (test_export_block) {
+		return 0;
+	}
+
+	(void)cb("myfoo/mybar", &val8, sizeof(val8));
+
+	(void)cb("myfoo/mybar16", &val16, sizeof(val16));
+
+	(void)cb("myfoo/mybar64", &val64, sizeof(val64));
+
+	return 0;
+}
+
+void ctest_clear_call_state(void)
+{
+	test_get_called = 0;
+	test_set_called = 0;
+	test_commit_called = 0;
+}
+
+int ctest_get_call_state(void)
+{
+	return test_get_called + test_set_called + test_commit_called;
+}
+
+void config_wipe_srcs(void)
+{
+	sys_slist_init(&settings_load_srcs);
+	settings_save_dst = NULL;
+}
+
+int fsutil_read_file(const char *path, off_t offset, size_t len, void *dst,
+		     size_t *out_len)
+{
+	struct fs_file_t file;
+	int rc;
+	ssize_t r_len = 0;
+
+	rc = fs_open(&file, path);
+	if (rc != 0) {
+		return rc;
+	}
+
+	r_len = fs_read(&file, dst, len);
+	if (r_len < 0) {
+		rc = -EIO;
+	} else {
+		*out_len = r_len;
+	}
+
+	fs_close(&file);
+	return rc;
+}
+
+int fsutil_write_file(const char *path, const void *data, size_t len)
+{
+	struct fs_file_t file;
+	int rc;
+
+	rc = fs_open(&file, path);
+	if (rc != 0) {
+		return rc;
+	}
+
+	if (fs_write(&file, data, len) != len) {
+		rc = -EIO;
+	}
+
+	fs_close(&file);
+	return rc;
+}
+
+char const *memmem(char const *mem, size_t mem_len, char const *sub,
+		   size_t sub_len)
+{
+	int i;
+
+	if (sub_len <= mem_len && sub_len > 0) {
+		for (i = 0; i <= mem_len - sub_len; i++) {
+			if (!memcmp(&mem[i], sub, sub_len)) {
+				return &mem[i];
+			}
+		}
+	}
+
+	return NULL;
+}
+
+int settings_test_file_strstr(const char *fname, char const *string,
+			      size_t str_len)
+{
+	int rc;
+	u32_t len;
+	size_t rlen;
+	char *buf;
+	struct fs_dirent entry;
+
+	rc = fs_stat(fname, &entry);
+	if (rc) {
+		return rc;
+	}
+
+	len = entry.size;
+	buf = (char *)k_malloc(len + 1);
+	zassert_not_null(buf, "out of memory");
+
+	rc = fsutil_read_file(fname, 0, len, buf, &rlen);
+	zassert_true(rc == 0, "can't access the file\n'");
+	zassert_true(rc == 0, "not enough data read\n'");
+	buf[rlen] = '\0';
+
+	if (memmem(buf, len, string, str_len)) {
+		return 0;
+	}
+
+	return -1;
+}

tests/subsys/settings/littlefs/src/CMakeLists.txt

@@ -13,6 +13,7 @@ target_link_libraries(settings_littlefs_test PRIVATE settings_test_fs)
 zephyr_include_directories(
 	$ENV{ZEPHYR_BASE}/subsys/settings/include
 	$ENV{ZEPHYR_BASE}/subsys/settings/src
+	$ENV{ZEPHYR_BASE}/tests/subsys/settings/fs/include
 	$ENV{ZEPHYR_BASE}/tests/subsys/settings/littlefs/src
 	)
 

tests/subsys/settings/littlefs/src/settings_test.h

@@ -4,50 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SETTINGS_FS_TEST_H
-#define _SETTINGS_FS_TEST_H
+#ifndef _SETTINGS_TEST_H
+#define _SETTINGS_TEST_H
 
-#include <stdio.h>
-#include <string.h>
-#include <ztest.h>
-#include <fs/fs.h>
-
-#include "settings/settings.h"
-
-#ifdef __cplusplus
-#extern "C" {
-#endif
+#include "settings_test_fs.h"
 
 #define TEST_FS_MPTR "/littlefs"
 #define TEST_CONFIG_DIR TEST_FS_MPTR""CONFIG_SETTINGS_FS_DIR
 
-extern u8_t val8;
-extern u16_t val16;
-extern u32_t val32;
-extern u64_t val64;
 
-extern int test_get_called;
-extern int test_set_called;
-extern int test_commit_called;
-extern int test_export_block;
-
-extern int c2_var_count;
-
-extern struct settings_handler c_test_handlers[];
-
-void ctest_clear_call_state(void);
-int ctest_get_call_state(void);
-
-void config_wipe_srcs(void);
-
-int fsutil_read_file(const char *path, off_t offset, size_t len, void *dst,
-		     size_t *out_len);
-int fsutil_write_file(const char *path, const void *data, size_t len);
-int settings_test_file_strstr(const char *fname, char const *string,
-			      size_t str_len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SETTINGS_FS_TEST_H */
+#endif /* _SETTINGS_TEST_H */

tests/subsys/settings/littlefs/src/settings_test_littlefs.c

@@ -6,245 +6,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "settings_test_fs.h"
 #include "settings_test.h"
 #include "settings_priv.h"
 
-
-u8_t val8;
-u16_t val16;
-u64_t val64;
-
-int test_get_called;
-int test_set_called;
-int test_commit_called;
-int test_export_block;
-
-int c2_var_count = 1;
-
-int c1_handle_get(const char *name, char *val, int val_len_max);
-int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb,
-		  void *cb_arg);
-int c1_handle_commit(void);
-int c1_handle_export(int (*cb)(const char *name,
-			       const void *value, size_t val_len));
-
-struct settings_handler c_test_handlers[] = {
-	{
-		.name = "myfoo",
-		.h_get = c1_handle_get,
-		.h_set = c1_handle_set,
-		.h_commit = c1_handle_commit,
-		.h_export = c1_handle_export
-	},
-};
-
-
-
-int c1_handle_get(const char *name, char *val, int val_len_max)
-{
-	test_get_called = 1;
-	const char *next;
-
-	if (settings_name_steq(name, "mybar", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val8));
-		memcpy(val, &val8, MIN(val_len_max, sizeof(val8)));
-		return val_len_max;
-	}
-
-	if (settings_name_steq(name, "mybar16", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val16));
-		memcpy(val, &val16, MIN(val_len_max, sizeof(val16)));
-		return val_len_max;
-	}
-
-	if (settings_name_steq(name, "mybar64", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val64));
-		memcpy(val, &val64, MIN(val_len_max, sizeof(val64)));
-		return val_len_max;
-	}
-
-	return -ENOENT;
-}
-
-int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb,
-		  void *cb_arg)
-{
-	int rc;
-	const char *next;
-	size_t val_len;
-
-	test_set_called = 1;
-	if (settings_name_steq(name, "mybar", &next) && !next) {
-		val_len = len;
-		zassert_true(val_len == 1, "bad set-value size");
-
-		rc = read_cb(cb_arg, &val8, sizeof(val8));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	if (settings_name_steq(name, "mybar16", &next) && !next) {
-		val_len = len;
-		zassert_true(val_len == 2, "bad set-value size");
-
-		rc = read_cb(cb_arg, &val16, sizeof(val16));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	if (settings_name_steq(name, "mybar64", &next) && !next) {
-		val_len = len;
-		zassert_true(val_len == 8, "bad set-value size");
-
-		rc = read_cb(cb_arg, &val64, sizeof(val64));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	return -ENOENT;
-}
-
-int c1_handle_commit(void)
-{
-	test_commit_called = 1;
-	return 0;
-}
-
-int c1_handle_export(int (*cb)(const char *name,
-			       const void *value, size_t val_len))
-{
-	if (test_export_block) {
-		return 0;
-	}
-
-	(void)cb("myfoo/mybar", &val8, sizeof(val8));
-
-	(void)cb("myfoo/mybar16", &val16, sizeof(val16));
-
-	(void)cb("myfoo/mybar64", &val64, sizeof(val64));
-
-	return 0;
-}
-
-void ctest_clear_call_state(void)
-{
-	test_get_called = 0;
-	test_set_called = 0;
-	test_commit_called = 0;
-}
-
-int ctest_get_call_state(void)
-{
-	return test_get_called + test_set_called + test_commit_called;
-}
-
-void config_wipe_srcs(void)
-{
-	sys_slist_init(&settings_load_srcs);
-	settings_save_dst = NULL;
-}
-
-int fsutil_read_file(const char *path, off_t offset, size_t len, void *dst,
-		     size_t *out_len)
-{
-	struct fs_file_t file;
-	int rc;
-	ssize_t r_len = 0;
-
-	rc = fs_open(&file, path);
-	if (rc != 0) {
-		return rc;
-	}
-
-	r_len = fs_read(&file, dst, len);
-	if (r_len < 0) {
-		rc = -EIO;
-	} else {
-		*out_len = r_len;
-	}
-
-	fs_close(&file);
-	return rc;
-}
-
-int fsutil_write_file(const char *path, const void *data, size_t len)
-{
-	struct fs_file_t file;
-	int rc;
-
-	rc = fs_open(&file, path);
-	if (rc != 0) {
-		return rc;
-	}
-
-	if (fs_write(&file, data, len) != len) {
-		rc = -EIO;
-	}
-
-	fs_close(&file);
-	return rc;
-}
-
-char const *memmem(char const *mem, size_t mem_len, char const *sub,
-		   size_t sub_len)
-{
-	int i;
-
-	if (sub_len <= mem_len && sub_len > 0) {
-		for (i = 0; i <= mem_len - sub_len; i++) {
-			if (!memcmp(&mem[i], sub, sub_len)) {
-				return &mem[i];
-			}
-		}
-	}
-
-	return NULL;
-}
-
-int settings_test_file_strstr(const char *fname, char const *string,
-			      size_t str_len)
-{
-	int rc;
-	u32_t len;
-	size_t rlen;
-	char *buf;
-	struct fs_dirent entry;
-
-	rc = fs_stat(fname, &entry);
-	if (rc) {
-		return rc;
-	}
-
-	len = entry.size;
-	buf = (char *)k_malloc(len + 1);
-	zassert_not_null(buf, "out of memory");
-
-	rc = fsutil_read_file(fname, 0, len, buf, &rlen);
-	zassert_true(rc == 0, "can't access the file\n'");
-	zassert_true(rc == 0, "not enough data read\n'");
-	buf[rlen] = '\0';
-
-	if (memmem(buf, len, string, str_len)) {
-		return 0;
-	}
-
-	return -1;
-}
-
-void config_empty_lookups(void);
-void test_config_insert(void);
-void test_config_getset_unknown(void);
-void test_config_getset_int(void);
-void test_config_getset_int64(void);
-void test_config_commit(void);
-
 void config_setup_littlefs(void);
-void test_config_empty_file(void);
-void test_config_small_file(void);
-void test_config_multiple_in_file(void);
-void test_config_save_in_file(void);
-void test_config_save_one_file(void);
-void test_config_compress_file(void);
 
 void test_main(void)
 {

tests/subsys/settings/nffs/src/CMakeLists.txt

@@ -13,6 +13,7 @@ target_link_libraries(settings_nffs_test PRIVATE settings_test_fs)
 zephyr_include_directories(
 	$ENV{ZEPHYR_BASE}/subsys/settings/include
 	$ENV{ZEPHYR_BASE}/subsys/settings/src
+	$ENV{ZEPHYR_BASE}/tests/subsys/settings/fs/include
 	$ENV{ZEPHYR_BASE}/tests/subsys/settings/nffs/src
 	)
 

tests/subsys/settings/nffs/src/settings_test.h

@@ -5,49 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SETTINGS_TEST_FCB_H
-#define _SETTINGS_TEST_FCB_H
+#ifndef _SETTINGS_TEST_H
+#define _SETTINGS_TEST_H
 
-#include <stdio.h>
-#include <string.h>
-#include <ztest.h>
-#include <fs/fs.h>
-
-#include "settings/settings.h"
-
-#ifdef __cplusplus
-#extern "C" {
-#endif
+#include "settings_test_fs.h"
 
 #define TEST_FS_MPTR "/nffs"
 #define TEST_CONFIG_DIR TEST_FS_MPTR"/config"
 
-extern u8_t val8;
-extern u16_t val16;
-extern u32_t val32;
-extern u64_t val64;
-
-extern int test_get_called;
-extern int test_set_called;
-extern int test_commit_called;
-extern int test_export_block;
-
-extern int c2_var_count;
-
-extern struct settings_handler c_test_handlers[];
-
-void ctest_clear_call_state(void);
-int ctest_get_call_state(void);
-
-void config_wipe_srcs(void);
-
-int fsutil_read_file(const char *path, off_t offset, size_t len, void *dst,
-		     size_t *out_len);
-int fsutil_write_file(const char *path, const void *data, size_t len);
-int settings_test_file_strstr(const char *fname, char const *string,
-			      size_t str_len);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SETTINGS_TEST_FCB_H */
+#endif /* _SETTINGS_TEST_H */

tests/subsys/settings/nffs/src/settings_test_nffs.c

@@ -10,242 +10,7 @@
 #include "settings_test.h"
 #include "settings_priv.h"
 
-
-u8_t val8;
-u16_t val16;
-u64_t val64;
-
-int test_get_called;
-int test_set_called;
-int test_commit_called;
-int test_export_block;
-
-int c2_var_count = 1;
-
-int c1_handle_get(const char *name, char *val, int val_len_max);
-int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb,
-		  void *cb_arg);
-int c1_handle_commit(void);
-int c1_handle_export(int (*cb)(const char *name,
-			       const void *value, size_t val_len));
-
-struct settings_handler c_test_handlers[] = {
-	{
-		.name = "myfoo",
-		.h_get = c1_handle_get,
-		.h_set = c1_handle_set,
-		.h_commit = c1_handle_commit,
-		.h_export = c1_handle_export
-	},
-};
-
-
-
-int c1_handle_get(const char *name, char *val, int val_len_max)
-{
-	test_get_called = 1;
-	const char *next;
-
-	if (settings_name_steq(name, "mybar", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val8));
-		memcpy(val, &val8, MIN(val_len_max, sizeof(val8)));
-		return val_len_max;
-	}
-
-	if (settings_name_steq(name, "mybar16", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val16));
-		memcpy(val, &val16, MIN(val_len_max, sizeof(val16)));
-		return val_len_max;
-	}
-
-	if (settings_name_steq(name, "mybar64", &next) && !next) {
-		val_len_max = MIN(val_len_max, sizeof(val64));
-		memcpy(val, &val64, MIN(val_len_max, sizeof(val64)));
-		return val_len_max;
-	}
-
-	return -ENOENT;
-}
-
-int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb,
-		  void *cb_arg)
-{
-	int rc;
-	const char *next;
-	size_t val_len;
-
-	test_set_called = 1;
-	if (settings_name_steq(name, "mybar", &next) && !next) {
-		val_len = len;
-		zassert_true(val_len == 1, "bad set-value size");
-
-		rc = read_cb(cb_arg, &val8, sizeof(val8));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	if (settings_name_steq(name, "mybar16", &next) && !next) {
-		val_len = len;
-		zassert_true(val_len == 2, "bad set-value size");
-
-		rc = read_cb(cb_arg, &val16, sizeof(val16));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	if (settings_name_steq(name, "mybar64", &next) && !next) {
-		val_len = len;
-		zassert_true(val_len == 8, "bad set-value size");
-
-		rc = read_cb(cb_arg, &val64, sizeof(val64));
-		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
-		return 0;
-	}
-
-	return -ENOENT;
-}
-
-int c1_handle_commit(void)
-{
-	test_commit_called = 1;
-	return 0;
-}
-
-int c1_handle_export(int (*cb)(const char *name,
-			       const void *value, size_t val_len))
-{
-	if (test_export_block) {
-		return 0;
-	}
-
-	(void)cb("myfoo/mybar", &val8, sizeof(val8));
-
-	(void)cb("myfoo/mybar16", &val16, sizeof(val16));
-
-	(void)cb("myfoo/mybar64", &val64, sizeof(val64));
-
-	return 0;
-}
-
-void ctest_clear_call_state(void)
-{
-	test_get_called = 0;
-	test_set_called = 0;
-	test_commit_called = 0;
-}
-
-int ctest_get_call_state(void)
-{
-	return test_get_called + test_set_called + test_commit_called;
-}
-
-void config_wipe_srcs(void)
-{
-	sys_slist_init(&settings_load_srcs);
-	settings_save_dst = NULL;
-}
-
-int fsutil_read_file(const char *path, off_t offset, size_t len, void *dst,
-		     size_t *out_len)
-{
-	struct fs_file_t file;
-	int rc;
-	ssize_t r_len = 0;
-
-	rc = fs_open(&file, path);
-	if (rc != 0) {
-		return rc;
-	}
-
-	r_len = fs_read(&file, dst, len);
-	if (r_len < 0) {
-		rc = -EIO;
-	} else {
-		*out_len = r_len;
-	}
-
-	fs_close(&file);
-	return rc;
-}
-
-int fsutil_write_file(const char *path, const void *data, size_t len)
-{
-	struct fs_file_t file;
-	int rc;
-
-	rc = fs_open(&file, path);
-	if (rc != 0) {
-		return rc;
-	}
-
-	if (fs_write(&file, data, len) != len) {
-		rc = -EIO;
-	}
-
-	fs_close(&file);
-	return rc;
-}
-
-char const *memmem(char const *mem, size_t mem_len, char const *sub,
-		   size_t sub_len)
-{
-	int i;
-
-	if (sub_len <= mem_len && sub_len > 0) {
-		for (i = 0; i <= mem_len - sub_len; i++) {
-			if (!memcmp(&mem[i], sub, sub_len)) {
-				return &mem[i];
-			}
-		}
-	}
-
-	return NULL;
-}
-
-int settings_test_file_strstr(const char *fname, char const *string,
-			      size_t str_len)
-{
-	int rc;
-	u32_t len;
-	size_t rlen;
-	char *buf;
-	struct fs_dirent entry;
-
-	rc = fs_stat(fname, &entry);
-	if (rc) {
-		return rc;
-	}
-
-	len = entry.size;
-	buf = (char *)k_malloc(len + 1);
-	zassert_not_null(buf, "out of memory");
-
-	rc = fsutil_read_file(fname, 0, len, buf, &rlen);
-	zassert_true(rc == 0, "can't access the file\n'");
-	zassert_true(rc == 0, "not enough data read\n'");
-	buf[rlen] = '\0';
-
-	if (memmem(buf, len, string, str_len)) {
-		return 0;
-	}
-
-	return -1;
-}
-
-void config_empty_lookups(void);
-void test_config_insert(void);
-void test_config_getset_unknown(void);
-void test_config_getset_int(void);
-void test_config_getset_int64(void);
-void test_config_commit(void);
-
 void config_setup_nffs(void);
-void test_config_empty_file(void);
-void test_config_small_file(void);
-void test_config_multiple_in_file(void);
-void test_config_save_in_file(void);
-void test_config_save_one_file(void);
-void test_config_compress_file(void);
 
 void test_main(void)
 {