michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests/subsys/settings: remove nffs related testsuite

Browse source 
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 <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2020-01-09 12:46:12 +01:00 • committed by Carles Cufí
commit 04b2c170c1
17 changed files with 0 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

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

17
tests/subsys/settings/nffs/base64/CMakeLists.txt
View file

@ -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()

2
tests/subsys/settings/nffs/base64/placeholder.c
View file

@ -1,2 +0,0 @@
/* SPDX-License-Identifier: Apache-2.0 */
/* Copyright (c) 2019 Intel Corporation */

28
tests/subsys/settings/nffs/base64/prj.conf
View file

@ -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

27
tests/subsys/settings/nffs/base64/prj_native_posix.conf
View file

@ -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

27
tests/subsys/settings/nffs/base64/prj_native_posix_64.conf
View file

@ -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

4
tests/subsys/settings/nffs/base64/testcase.yaml
View file

@ -1,4 +0,0 @@
tests:
system.settings.nffs:
platform_whitelist: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64
tags: settings_fs filesystem

18
tests/subsys/settings/nffs/raw/CMakeLists.txt
View file

@ -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()

2
tests/subsys/settings/nffs/raw/placeholder.c
View file

@ -1,2 +0,0 @@
/* SPDX-License-Identifier: Apache-2.0 */
/* Copyright (c) 2019 Intel Corporation */

27
tests/subsys/settings/nffs/raw/prj.conf
View file

@ -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

26
tests/subsys/settings/nffs/raw/prj_native_posix.conf
View file

@ -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

26
tests/subsys/settings/nffs/raw/prj_native_posix_64.conf
View file

@ -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

4
tests/subsys/settings/nffs/raw/testcase.yaml
View file

@ -1,4 +0,0 @@
tests:
system.settings.nffs:
platform_whitelist: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64
tags: settings_fs

21
tests/subsys/settings/nffs/src/CMakeLists.txt
View file

@ -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})

40
tests/subsys/settings/nffs/src/settings_setup_nffs.c
View file

@ -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 <device.h>
#include <fs/fs.h>
#include <nffs/nffs.h>
/* 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);
}

16
tests/subsys/settings/nffs/src/settings_test.h
View file

@ -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 */

36
tests/subsys/settings/nffs/src/settings_test_nffs.c
View file

@ -1,36 +0,0 @@
/*
* Copyright (c) 2018 Nordic Semiconductor ASA
* Copyright (c) 2015 Runtime Inc
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <stdlib.h>
#include <string.h>
#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);
}