From cc81e02e1786599548b48a91f5f551428ee973fe Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Tue, 14 Jan 2020 13:23:37 +0100 Subject: [PATCH] tests/subsys/fs/multi-fs: suppres kconfig issue This patch is for suppress CI Kconfig issues caused by temporary dead code in this test-suie. Signed-off-by: Andrzej Puzdrowski --- tests/subsys/fs/multi-fs/prj.conf | 9 --------- tests/subsys/fs/multi-fs/prj_fs_shell.conf | 9 --------- tests/subsys/fs/multi-fs/src/nffs_test_utils.c | 2 +- tests/subsys/fs/multi-fs/src/test_nffs_mount.c | 2 +- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/tests/subsys/fs/multi-fs/prj.conf b/tests/subsys/fs/multi-fs/prj.conf index 0c2d3ab8e45..56b136cd4e8 100644 --- a/tests/subsys/fs/multi-fs/prj.conf +++ b/tests/subsys/fs/multi-fs/prj.conf @@ -2,19 +2,10 @@ CONFIG_FILE_SYSTEM=y CONFIG_LOG=y CONFIG_FAT_FILESYSTEM_ELM=y CONFIG_DISK_ACCESS_RAM=y -CONFIG_FILE_SYSTEM_NFFS=y CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH=y CONFIG_TEST_FLASH_DRIVERS=y -CONFIG_FS_NFFS_FLASH_DEV_NAME="ram_flash_test_drv" -CONFIG_FS_NFFS_NUM_BLOCKS=1024 -CONFIG_FS_NFFS_NUM_CACHE_BLOCKS=1 -CONFIG_FS_NFFS_NUM_CACHE_INODES=1 -CONFIG_FS_NFFS_NUM_DIRS=4 -CONFIG_FS_NFFS_NUM_FILES=4 -CONFIG_FS_NFFS_NUM_INODES=1024 CONFIG_HEAP_MEM_POOL_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 CONFIG_ZTEST_STACKSIZE=2048 CONFIG_ZTEST=y diff --git a/tests/subsys/fs/multi-fs/prj_fs_shell.conf b/tests/subsys/fs/multi-fs/prj_fs_shell.conf index 84b128fe10a..1540847689a 100644 --- a/tests/subsys/fs/multi-fs/prj_fs_shell.conf +++ b/tests/subsys/fs/multi-fs/prj_fs_shell.conf @@ -7,19 +7,10 @@ CONFIG_SHELL_CMD_BUFF_SIZE=90 CONFIG_FILE_SYSTEM_SHELL=y CONFIG_FAT_FILESYSTEM_ELM=y CONFIG_DISK_ACCESS_RAM=y -CONFIG_FILE_SYSTEM_NFFS=y CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH=y CONFIG_TEST_FLASH_DRIVERS=y -CONFIG_FS_NFFS_FLASH_DEV_NAME="ram_flash_test_drv" -CONFIG_FS_NFFS_NUM_BLOCKS=1024 -CONFIG_FS_NFFS_NUM_CACHE_BLOCKS=1 -CONFIG_FS_NFFS_NUM_CACHE_INODES=1 -CONFIG_FS_NFFS_NUM_DIRS=4 -CONFIG_FS_NFFS_NUM_FILES=4 -CONFIG_FS_NFFS_NUM_INODES=1024 CONFIG_HEAP_MEM_POOL_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 CONFIG_ZTEST_STACKSIZE=2048 CONFIG_ZTEST=y diff --git a/tests/subsys/fs/multi-fs/src/nffs_test_utils.c b/tests/subsys/fs/multi-fs/src/nffs_test_utils.c index e15b6bdf5d9..2abc18bb224 100644 --- a/tests/subsys/fs/multi-fs/src/nffs_test_utils.c +++ b/tests/subsys/fs/multi-fs/src/nffs_test_utils.c @@ -31,7 +31,7 @@ void nffs_test_util_overwrite_data(u8_t *data, u32_t data_len, struct flash_pages_info info; off_t off; - dev = device_get_binding(CONFIG_FS_NFFS_FLASH_DEV_NAME); + /*dev = device_get_binding();*/ flash_get_page_info_by_offs(dev, addr, &info); nffs_os_flash_read(0, info.start_offset, area_buf, info.size); diff --git a/tests/subsys/fs/multi-fs/src/test_nffs_mount.c b/tests/subsys/fs/multi-fs/src/test_nffs_mount.c index 69f48553d73..e3b00a52938 100644 --- a/tests/subsys/fs/multi-fs/src/test_nffs_mount.c +++ b/tests/subsys/fs/multi-fs/src/test_nffs_mount.c @@ -29,7 +29,7 @@ static int test_mount(void) struct device *flash_dev; int res; - flash_dev = device_get_binding(CONFIG_FS_NFFS_FLASH_DEV_NAME); + /*flash_dev = device_get_binding();*/ if (!flash_dev) { return -ENODEV; }