modules: Remove fff tests
I've update FFF to run tests in the native CI for GitHub, so we no longer need to run these extra tests. Remove the fff module from west.yml since the module was only used in the CI and the header was directly included in the Zephyr tree. See https://github.com/zephyrproject-rtos/fff/pull/2 Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
Yuval Peress
Anas Nashif
parent
0dacc2583d
commit
7c48900d14
|
|
@ -89,9 +89,6 @@ comment "loramac-node module not available."
|
|||
comment "CANopenNode module not available."
|
||||
depends on !ZEPHYR_CANOPENNODE_MODULE
|
||||
|
||||
comment "FFF module not available."
|
||||
depends on !ZEPHYR_FFF_MODULE
|
||||
|
||||
comment "zcbor module not available."
|
||||
depends on !ZEPHYR_ZCBOR_MODULE
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
# Copyright (c) 2021 Google LLC
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
|
||||
if(CONFIG_FFF_TEST)
|
||||
# Add the FFF C test suites as ztest suites
|
||||
message("CONFIG_FFF_TEST_TYPE_C=${CONFIG_FFF_TEST_TYPE_C}")
|
||||
message("CONFIG_FFF_TEST_TYPE_GLOBAL_C=${CONFIG_FFF_TEST_TYPE_GLOBAL_C}")
|
||||
zephyr_library()
|
||||
zephyr_include_directories(
|
||||
include
|
||||
"${ZEPHYR_CURRENT_MODULE_DIR}"
|
||||
"${ZEPHYR_CURRENT_MODULE_DIR}/test"
|
||||
)
|
||||
if(DEFINED CONFIG_FFF_TEST_TYPE_C)
|
||||
zephyr_library_sources("${ZEPHYR_CURRENT_MODULE_DIR}/test/fff_test_c.c")
|
||||
elseif(DEFINED CONFIG_FFF_TEST_TYPE_GLOBAL_C)
|
||||
zephyr_library_sources(
|
||||
"${ZEPHYR_CURRENT_MODULE_DIR}/test/fff_test_global_c.c"
|
||||
"${ZEPHYR_CURRENT_MODULE_DIR}/test/global_fakes.c"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# Copyright (c) 2021 Google LLC
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
config ZEPHYR_FFF_MODULE
|
||||
bool
|
||||
|
||||
menuconfig FFF_TEST
|
||||
bool "FFF Test suite"
|
||||
help
|
||||
Enable the FFF test suite. This should really only be called from the tests for FFF under
|
||||
tests/ztest/mock_fff/. It brings in the test sources from the upstream FFF module.
|
||||
|
||||
if FFF_TEST
|
||||
|
||||
choice FFF_TEST_TYPE
|
||||
prompt "The type of FFF test to bring in"
|
||||
|
||||
config FFF_TEST_TYPE_C
|
||||
bool "Compile the FFF default C test suite as a zephyr library"
|
||||
|
||||
config FFF_TEST_TYPE_GLOBAL_C
|
||||
bool "Compile the FFF global C test suite as a zephyr library"
|
||||
|
||||
endchoice # FFF_TEST_TYPE
|
||||
|
||||
endif # FFF_TEST
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
/* Copyright (c) 2021 Google LLC
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#ifndef MODULES_FFF_TEST_INCLUDE_C_TEST_FRAMEWORK_H_
|
||||
#define MODULES_FFF_TEST_INCLUDE_C_TEST_FRAMEWORK_H_
|
||||
|
||||
#include <zephyr/ztest.h>
|
||||
#include <zephyr/sys/printk.h>
|
||||
|
||||
void setup(void);
|
||||
void fff_test_suite(void);
|
||||
|
||||
#define PRINTF(FMT, args...)
|
||||
#define TEST_F(SUITE, NAME) __attribute__((unused)) static void test_##NAME(void)
|
||||
#define RUN_TEST(SUITE, NAME) \
|
||||
do { \
|
||||
ztest_test_suite( \
|
||||
SUITE##_##NAME, \
|
||||
ztest_unit_test_setup_teardown(test_##NAME, setup, unit_test_noop)); \
|
||||
ztest_run_test_suite(SUITE##_##NAME); \
|
||||
} while (0)
|
||||
#define ASSERT_EQ(A, B) zassert_equal((A), (B), NULL)
|
||||
#define ASSERT_TRUE(A) zassert_true((A), NULL)
|
||||
|
||||
#endif /* MODULES_FFF_TEST_INCLUDE_C_TEST_FRAMEWORK_H_ */
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
# Copyright 2021 Google LLC
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
cmake_minimum_required(VERSION 3.20.0)
|
||||
|
||||
# Add the Zephyr package and create the project
|
||||
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(mock_fff)
|
||||
|
||||
# Glob the sources and add them to the app
|
||||
FILE(GLOB app_sources src/*.c)
|
||||
target_sources(app PRIVATE ${app_sources})
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
CONFIG_ZTEST=y
|
||||
CONFIG_FFF_TEST=y
|
||||
CONFIG_FFF_TEST_TYPE_C=y
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
CONFIG_ZTEST=y
|
||||
CONFIG_FFF_TEST=y
|
||||
CONFIG_FFF_TEST_TYPE_GLOBAL_C=y
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
/* Copyright 2021 Google LLC
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <zephyr/ztest.h>
|
||||
#include <zephyr/fff.h>
|
||||
|
||||
#include <c_test_framework.h>
|
||||
|
||||
void test_main(void)
|
||||
{
|
||||
fff_test_suite();
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
tests:
|
||||
testing.ztest.mock_fff:
|
||||
filter: CONFIG_ZEPHYR_FFF_MODULE
|
||||
tags: test_framework
|
||||
integration_platforms:
|
||||
- native_posix
|
||||
testing.ztest.mock_fff_global:
|
||||
filter: CONFIG_ZEPHYR_FFF_MODULE
|
||||
tags: test_framework
|
||||
extra_args: CONF_FILE=prj_global.conf
|
||||
integration_platforms:
|
||||
- native_posix
|
||||
8
west.yml
8
west.yml
|
|
@ -46,11 +46,6 @@ manifest:
|
|||
path: modules/fs/fatfs
|
||||
groups:
|
||||
- fs
|
||||
- name: fff
|
||||
revision: 6ce5ba26486e93d5b7696a3e23f0585932c14b16
|
||||
path: modules/lib/fff
|
||||
groups:
|
||||
- ci
|
||||
- name: hal_altera
|
||||
revision: 0d225ddd314379b32355a00fb669eacf911e750d
|
||||
path: modules/hal/altera
|
||||
|
|
@ -264,9 +259,6 @@ manifest:
|
|||
path: modules/lib/zscilib
|
||||
revision: ca070ddabdaf67175a2da901d0bd62e8899371c5
|
||||
|
||||
group-filter:
|
||||
- -ci
|
||||
|
||||
self:
|
||||
path: zephyr
|
||||
west-commands: scripts/west-commands.yml
|
||||
|
|
|
|||
Loading…
Reference in a new issue