From 04b2c170c1b0ae2f36ae2f501fee149b1f1eedd2 Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Thu, 9 Jan 2020 12:46:12 +0100 Subject: [PATCH] tests/subsys/settings: remove nffs related testsuite settings nffs targeted test were removed. the file function settings suite was disabled as need some rework in order to use litlefs. Signed-off-by: Andrzej Puzdrowski --- .../{testcase.yaml => disabled_testcase.yaml} | 0 .../settings/nffs/base64/CMakeLists.txt | 17 -------- .../subsys/settings/nffs/base64/placeholder.c | 2 - tests/subsys/settings/nffs/base64/prj.conf | 28 ------------- .../nffs/base64/prj_native_posix.conf | 27 ------------- .../nffs/base64/prj_native_posix_64.conf | 27 ------------- .../subsys/settings/nffs/base64/testcase.yaml | 4 -- tests/subsys/settings/nffs/raw/CMakeLists.txt | 18 --------- tests/subsys/settings/nffs/raw/placeholder.c | 2 - tests/subsys/settings/nffs/raw/prj.conf | 27 ------------- .../settings/nffs/raw/prj_native_posix.conf | 26 ------------ .../nffs/raw/prj_native_posix_64.conf | 26 ------------ tests/subsys/settings/nffs/raw/testcase.yaml | 4 -- tests/subsys/settings/nffs/src/CMakeLists.txt | 21 ---------- .../settings/nffs/src/settings_setup_nffs.c | 40 ------------------- .../subsys/settings/nffs/src/settings_test.h | 16 -------- .../settings/nffs/src/settings_test_nffs.c | 36 ----------------- 17 files changed, 321 deletions(-) rename tests/subsys/settings/functional/file/{testcase.yaml => disabled_testcase.yaml} (100%) delete mode 100644 tests/subsys/settings/nffs/base64/CMakeLists.txt delete mode 100644 tests/subsys/settings/nffs/base64/placeholder.c delete mode 100644 tests/subsys/settings/nffs/base64/prj.conf delete mode 100644 tests/subsys/settings/nffs/base64/prj_native_posix.conf delete mode 100644 tests/subsys/settings/nffs/base64/prj_native_posix_64.conf delete mode 100644 tests/subsys/settings/nffs/base64/testcase.yaml delete mode 100644 tests/subsys/settings/nffs/raw/CMakeLists.txt delete mode 100644 tests/subsys/settings/nffs/raw/placeholder.c delete mode 100644 tests/subsys/settings/nffs/raw/prj.conf delete mode 100644 tests/subsys/settings/nffs/raw/prj_native_posix.conf delete mode 100644 tests/subsys/settings/nffs/raw/prj_native_posix_64.conf delete mode 100644 tests/subsys/settings/nffs/raw/testcase.yaml delete mode 100644 tests/subsys/settings/nffs/src/CMakeLists.txt delete mode 100644 tests/subsys/settings/nffs/src/settings_setup_nffs.c delete mode 100644 tests/subsys/settings/nffs/src/settings_test.h delete mode 100644 tests/subsys/settings/nffs/src/settings_test_nffs.c diff --git a/tests/subsys/settings/functional/file/testcase.yaml b/tests/subsys/settings/functional/file/disabled_testcase.yaml similarity index 100% rename from tests/subsys/settings/functional/file/testcase.yaml rename to tests/subsys/settings/functional/file/disabled_testcase.yaml diff --git a/tests/subsys/settings/nffs/base64/CMakeLists.txt b/tests/subsys/settings/nffs/base64/CMakeLists.txt deleted file mode 100644 index f7baf92791c..00000000000 --- a/tests/subsys/settings/nffs/base64/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -cmake_minimum_required(VERSION 3.13.1) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(nffs) - -add_subdirectory(../src nffs_test_bindir) -target_link_libraries(app PRIVATE settings_nffs_test) - -# The code is in the library common to several tests. -target_sources(app PRIVATE placeholder.c) - -if(TEST) - target_compile_definitions(app PRIVATE - -DTEST_${TEST} - ) -endif() diff --git a/tests/subsys/settings/nffs/base64/placeholder.c b/tests/subsys/settings/nffs/base64/placeholder.c deleted file mode 100644 index d7350bf052f..00000000000 --- a/tests/subsys/settings/nffs/base64/placeholder.c +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ -/* Copyright (c) 2019 Intel Corporation */ diff --git a/tests/subsys/settings/nffs/base64/prj.conf b/tests/subsys/settings/nffs/base64/prj.conf deleted file mode 100644 index c5a2d9c7f1e..00000000000 --- a/tests/subsys/settings/nffs/base64/prj.conf +++ /dev/null @@ -1,28 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y -CONFIG_ARM_MPU=n - -CONFIG_ZTEST_STACKSIZE=2048 -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_HEAP_MEM_POOL_SIZE=1024 - -CONFIG_FILE_SYSTEM=y -CONFIG_LOG=y -CONFIG_FILE_SYSTEM_NFFS=y -CONFIG_FS_NFFS_FLASH_DEV_NAME="NRF_FLASH_DRV_NAME" -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_FILE_SYSTEM_NFFS=y -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/nffs/base64/prj_native_posix.conf b/tests/subsys/settings/nffs/base64/prj_native_posix.conf deleted file mode 100644 index eacbedf28f5..00000000000 --- a/tests/subsys/settings/nffs/base64/prj_native_posix.conf +++ /dev/null @@ -1,27 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y - -CONFIG_ZTEST_STACKSIZE=2048 -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_HEAP_MEM_POOL_SIZE=1024 - -CONFIG_FILE_SYSTEM=y -CONFIG_LOG=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_FILE_SYSTEM_NFFS=y -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/nffs/base64/prj_native_posix_64.conf b/tests/subsys/settings/nffs/base64/prj_native_posix_64.conf deleted file mode 100644 index eacbedf28f5..00000000000 --- a/tests/subsys/settings/nffs/base64/prj_native_posix_64.conf +++ /dev/null @@ -1,27 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y - -CONFIG_ZTEST_STACKSIZE=2048 -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_HEAP_MEM_POOL_SIZE=1024 - -CONFIG_FILE_SYSTEM=y -CONFIG_LOG=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_FILE_SYSTEM_NFFS=y -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/nffs/base64/testcase.yaml b/tests/subsys/settings/nffs/base64/testcase.yaml deleted file mode 100644 index 2da8e00b93f..00000000000 --- a/tests/subsys/settings/nffs/base64/testcase.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tests: - system.settings.nffs: - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64 - tags: settings_fs filesystem diff --git a/tests/subsys/settings/nffs/raw/CMakeLists.txt b/tests/subsys/settings/nffs/raw/CMakeLists.txt deleted file mode 100644 index 84426c62ef7..00000000000 --- a/tests/subsys/settings/nffs/raw/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -cmake_minimum_required(VERSION 3.13.1) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(NONE) - -add_subdirectory(../src nffs_test_bindir) - -target_link_libraries(app PRIVATE settings_nffs_test) - -# The code is in the library common to several tests. -target_sources(app PRIVATE placeholder.c) - -if(TEST) - target_compile_definitions(app PRIVATE - -DTEST_${TEST} - ) -endif() diff --git a/tests/subsys/settings/nffs/raw/placeholder.c b/tests/subsys/settings/nffs/raw/placeholder.c deleted file mode 100644 index d7350bf052f..00000000000 --- a/tests/subsys/settings/nffs/raw/placeholder.c +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ -/* Copyright (c) 2019 Intel Corporation */ diff --git a/tests/subsys/settings/nffs/raw/prj.conf b/tests/subsys/settings/nffs/raw/prj.conf deleted file mode 100644 index 627da06fa6c..00000000000 --- a/tests/subsys/settings/nffs/raw/prj.conf +++ /dev/null @@ -1,27 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y -CONFIG_ARM_MPU=n - -CONFIG_ZTEST_STACKSIZE=2048 -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_HEAP_MEM_POOL_SIZE=1024 - -CONFIG_FILE_SYSTEM=y -CONFIG_FILE_SYSTEM_NFFS=y -CONFIG_FS_NFFS_FLASH_DEV_NAME="NRF_FLASH_DRV_NAME" -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_FILE_SYSTEM_NFFS=y -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/nffs/raw/prj_native_posix.conf b/tests/subsys/settings/nffs/raw/prj_native_posix.conf deleted file mode 100644 index dd7bd38593b..00000000000 --- a/tests/subsys/settings/nffs/raw/prj_native_posix.conf +++ /dev/null @@ -1,26 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y - -CONFIG_ZTEST_STACKSIZE=2048 -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_HEAP_MEM_POOL_SIZE=1024 - -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_FILE_SYSTEM_NFFS=y -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/nffs/raw/prj_native_posix_64.conf b/tests/subsys/settings/nffs/raw/prj_native_posix_64.conf deleted file mode 100644 index dd7bd38593b..00000000000 --- a/tests/subsys/settings/nffs/raw/prj_native_posix_64.conf +++ /dev/null @@ -1,26 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y - -CONFIG_ZTEST_STACKSIZE=2048 -CONFIG_MAIN_STACK_SIZE=1024 -CONFIG_HEAP_MEM_POOL_SIZE=1024 - -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_FILE_SYSTEM_NFFS=y -CONFIG_NFFS_FILESYSTEM_MAX_AREAS=12 - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/nffs/raw/testcase.yaml b/tests/subsys/settings/nffs/raw/testcase.yaml deleted file mode 100644 index ffe99a4e7da..00000000000 --- a/tests/subsys/settings/nffs/raw/testcase.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tests: - system.settings.nffs: - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64 - tags: settings_fs diff --git a/tests/subsys/settings/nffs/src/CMakeLists.txt b/tests/subsys/settings/nffs/src/CMakeLists.txt deleted file mode 100644 index c25fc2a3033..00000000000 --- a/tests/subsys/settings/nffs/src/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2019 Intel Corporation - -zephyr_library_named(settings_nffs_test) - -add_subdirectory(../../src settings_test_bindir) -add_subdirectory(../../fs/src settings_test_fs_bindir) - -target_link_libraries(settings_nffs_test PRIVATE NFFS) -target_link_libraries(settings_nffs_test PRIVATE settings_test) -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 - ) - -FILE(GLOB mysources *.c) -zephyr_library_sources(${mysources}) diff --git a/tests/subsys/settings/nffs/src/settings_setup_nffs.c b/tests/subsys/settings/nffs/src/settings_setup_nffs.c deleted file mode 100644 index 05b305f5dad..00000000000 --- a/tests/subsys/settings/nffs/src/settings_setup_nffs.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018 Nordic Semiconductor ASA - * Copyright (c) 2015 Runtime Inc - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "settings_test.h" -#include -#include -#include - -/* NFFS work area strcut */ -static struct nffs_flash_desc flash_desc; - -/* mounting info */ -static struct fs_mount_t nffs_mnt = { - .type = FS_NFFS, - .mnt_point = TEST_FS_MPTR, - .fs_data = &flash_desc, -}; - -void config_setup_nffs(void) -{ - struct device *flash_dev; - 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_unlink(TEST_CONFIG_DIR); - zassert_true(rc == 0 || rc == -ENOENT, - "can't delete config directory%d\n", rc); -} diff --git a/tests/subsys/settings/nffs/src/settings_test.h b/tests/subsys/settings/nffs/src/settings_test.h deleted file mode 100644 index 5280c15a7ae..00000000000 --- a/tests/subsys/settings/nffs/src/settings_test.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2018 Nordic Semiconductor ASA - * Copyright (c) 2015 Runtime Inc - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#ifndef _SETTINGS_TEST_H -#define _SETTINGS_TEST_H - -#include "settings_test_fs.h" - -#define TEST_FS_MPTR "/nffs" -#define TEST_CONFIG_DIR TEST_FS_MPTR"/config" - -#endif /* _SETTINGS_TEST_H */ diff --git a/tests/subsys/settings/nffs/src/settings_test_nffs.c b/tests/subsys/settings/nffs/src/settings_test_nffs.c deleted file mode 100644 index 14244cf7d59..00000000000 --- a/tests/subsys/settings/nffs/src/settings_test_nffs.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2018 Nordic Semiconductor ASA - * Copyright (c) 2015 Runtime Inc - * - * SPDX-License-Identifier: Apache-2.0 - */ -#include -#include - -#include "settings_test.h" -#include "settings_priv.h" - -void config_setup_nffs(void); - -void test_main(void) -{ - ztest_test_suite(test_config_fcb, - /* Config tests */ - ztest_unit_test(config_empty_lookups), - ztest_unit_test(test_config_insert), - ztest_unit_test(test_config_getset_unknown), - ztest_unit_test(test_config_getset_int), - ztest_unit_test(test_config_getset_int64), - ztest_unit_test(test_config_commit), - /* NFFS as backing storage. */ - ztest_unit_test(config_setup_nffs), - ztest_unit_test(test_config_empty_file), - ztest_unit_test(test_config_small_file), - ztest_unit_test(test_config_multiple_in_file), - ztest_unit_test(test_config_save_in_file), - ztest_unit_test(test_config_save_one_file), - ztest_unit_test(test_config_compress_file) - ); - - ztest_run_test_suite(test_config_fcb); -}