diff --git a/modules/Kconfig b/modules/Kconfig index 103ea092ae5..f96f418c11b 100644 --- a/modules/Kconfig +++ b/modules/Kconfig @@ -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 diff --git a/modules/fff/CMakeLists.txt b/modules/fff/CMakeLists.txt deleted file mode 100644 index a7cbc661759..00000000000 --- a/modules/fff/CMakeLists.txt +++ /dev/null @@ -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() diff --git a/modules/fff/Kconfig b/modules/fff/Kconfig deleted file mode 100644 index c430b8228d4..00000000000 --- a/modules/fff/Kconfig +++ /dev/null @@ -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 diff --git a/modules/fff/include/c_test_framework.h b/modules/fff/include/c_test_framework.h deleted file mode 100644 index 8a1d56395c1..00000000000 --- a/modules/fff/include/c_test_framework.h +++ /dev/null @@ -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 -#include - -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_ */ diff --git a/tests/ztest/mock_fff/CMakeLists.txt b/tests/ztest/mock_fff/CMakeLists.txt deleted file mode 100644 index 5a5540da28b..00000000000 --- a/tests/ztest/mock_fff/CMakeLists.txt +++ /dev/null @@ -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}) diff --git a/tests/ztest/mock_fff/prj.conf b/tests/ztest/mock_fff/prj.conf deleted file mode 100644 index 5bdc0b41e63..00000000000 --- a/tests/ztest/mock_fff/prj.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_FFF_TEST=y -CONFIG_FFF_TEST_TYPE_C=y diff --git a/tests/ztest/mock_fff/prj_global.conf b/tests/ztest/mock_fff/prj_global.conf deleted file mode 100644 index 8f1817d617c..00000000000 --- a/tests/ztest/mock_fff/prj_global.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_FFF_TEST=y -CONFIG_FFF_TEST_TYPE_GLOBAL_C=y diff --git a/tests/ztest/mock_fff/src/main.c b/tests/ztest/mock_fff/src/main.c deleted file mode 100644 index 908018a0ca6..00000000000 --- a/tests/ztest/mock_fff/src/main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright 2021 Google LLC - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -#include - -void test_main(void) -{ - fff_test_suite(); -} diff --git a/tests/ztest/mock_fff/testcase.yaml b/tests/ztest/mock_fff/testcase.yaml deleted file mode 100644 index d1c14d345a1..00000000000 --- a/tests/ztest/mock_fff/testcase.yaml +++ /dev/null @@ -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 diff --git a/west.yml b/west.yml index 534e8dd48bb..64430eadd33 100644 --- a/west.yml +++ b/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