michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests/subsys/settings/functional/file: use littlefs

Browse source 
Switch to using LittleFS instead of NFFS, which was removed.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2020-01-10 11:48:36 +01:00 • committed by Carles Cufí
commit e446505473
9 changed files with 41 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/subsys/settings/functional/file/CMakeLists.txt
View file

@ -9,7 +9,6 @@ target_sources(app PRIVATE ${app_sources})
zephyr_include_directories(
$ENV{ZEPHYR_BASE}/subsys/settings/include
$ENV{ZEPHYR_BASE}/subsys/settings/src
$ENV{ZEPHYR_BASE}/tests/subsys/settings/nffs/src
)
if(TEST)

2
tests/subsys/settings/functional/file/native_posix.overlay
View file

@ -19,7 +19,7 @@
storage_partition: partition@70000 {
label = "storage";
reg = <0x00070000 0x10000>;
reg = <0x00070000 0x20000>;
};
};
};

25
tests/subsys/settings/functional/file/native_posix_64.overlay Normal file
View file

@ -0,0 +1,25 @@
/*
* Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
*
* SPDX-License-Identifier: Apache-2.0
*/
/delete-node/ &storage_partition;
/delete-node/ &scratch_partition;
&flash0 {
/*
* For more information, see:
* http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
*/
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
storage_partition: partition@70000 {
label = "storage";
reg = <0x00070000 0x20000>;
};
};
};

10
tests/subsys/settings/functional/file/prj.conf
View file

@ -7,15 +7,7 @@ CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_NFFS=y
CONFIG_FS_NFFS_FLASH_DEV_NAME="flash_ctrl"
CONFIG_FS_NFFS_NUM_FILES=4
CONFIG_FS_NFFS_NUM_DIRS=4
CONFIG_FS_NFFS_NUM_INODES=1024
CONFIG_FS_NFFS_NUM_BLOCKS=1024
CONFIG_FS_NFFS_NUM_CACHE_INODES=1
CONFIG_FS_NFFS_NUM_CACHE_BLOCKS=1
CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12
CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_RUNTIME=y

10
tests/subsys/settings/functional/file/prj_native_posix.conf
View file

@ -5,15 +5,7 @@ CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_NFFS=y
CONFIG_FS_NFFS_FLASH_DEV_NAME="flash_ctrl"
CONFIG_FS_NFFS_NUM_FILES=4
CONFIG_FS_NFFS_NUM_DIRS=4
CONFIG_FS_NFFS_NUM_INODES=1024
CONFIG_FS_NFFS_NUM_BLOCKS=1024
CONFIG_FS_NFFS_NUM_CACHE_INODES=1
CONFIG_FS_NFFS_NUM_CACHE_BLOCKS=1
CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12
CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_RUNTIME=y

10
tests/subsys/settings/functional/file/prj_native_posix_64.conf
View file

@ -5,15 +5,7 @@ CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_NFFS=y
CONFIG_FS_NFFS_FLASH_DEV_NAME="flash_ctrl"
CONFIG_FS_NFFS_NUM_FILES=4
CONFIG_FS_NFFS_NUM_DIRS=4
CONFIG_FS_NFFS_NUM_INODES=1024
CONFIG_FS_NFFS_NUM_BLOCKS=1024
CONFIG_FS_NFFS_NUM_CACHE_INODES=1
CONFIG_FS_NFFS_NUM_CACHE_BLOCKS=1
CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12
CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_RUNTIME=y

10
tests/subsys/settings/functional/file/prj_qemu_x86.conf
View file

@ -5,15 +5,7 @@ CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_NFFS=y
CONFIG_FS_NFFS_FLASH_DEV_NAME="flash_ctrl"
CONFIG_FS_NFFS_NUM_FILES=4
CONFIG_FS_NFFS_NUM_DIRS=4
CONFIG_FS_NFFS_NUM_INODES=1024
CONFIG_FS_NFFS_NUM_BLOCKS=1024
CONFIG_FS_NFFS_NUM_CACHE_INODES=1
CONFIG_FS_NFFS_NUM_CACHE_BLOCKS=1
CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12
CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_RUNTIME=y

0
tests/subsys/settings/functional/file/disabled_testcase.yaml → tests/subsys/settings/functional/file/testcase.yaml
View file

29
tests/subsys/settings/functional/src/settings_basic_test.c
View file

@ -20,9 +20,8 @@ LOG_MODULE_REGISTER(settings_basic_test);
#include <storage/flash_map.h>
#endif
#if IS_ENABLED(CONFIG_SETTINGS_FS)
#include <device.h>
#include <fs/fs.h>
#include <nffs/nffs.h>
#include <fs/littlefs.h>
#endif
/* The standard test expects a cleared flash area. Make sure it has
@ -41,26 +40,20 @@ static void test_clear_settings(void)
zassert_true(rc == 0, "clear settings failed");
#endif
#if IS_ENABLED(CONFIG_SETTINGS_FS)
/* NFFS work area strcut */
static struct nffs_flash_desc flash_desc;
FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(cstorage);
/* mounting info */
static struct fs_mount_t nffs_mnt = {
.type = FS_NFFS,
.mnt_point = "/ff",
.fs_data = &flash_desc,
};
struct device *flash_dev;
static struct fs_mount_t littlefs_mnt = {
.type = FS_LITTLEFS,
.fs_data = &cstorage,
.storage_dev = (void *)DT_FLASH_AREA_STORAGE_ID,
.mnt_point = "/ff"
};
int rc;
flash_dev = device_get_binding(CONFIG_FS_NFFS_FLASH_DEV_NAME);
zassert_not_null(flash_dev, "Can't bind to the flash device");
/* set backend storage dev */
nffs_mnt.storage_dev = flash_dev;
rc = fs_mount(&nffs_mnt);
zassert_true(rc == 0, "mounting nffs [%d]\n", rc);
rc = fs_mount(&littlefs_mnt);
zassert_true(rc == 0, "mounting littlefs [%d]\n", rc);
rc = fs_unlink(CONFIG_SETTINGS_FS_FILE);
zassert_true(rc == 0 || rc == -ENOENT,