test: unittest: Fix deprecated ZephyrUnittest
Fix the deprecated calls to loading ZephyrUnittest by replacing them with `Zephyr COMPONENTS unittest`. Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
parent
d06d1397c3
commit
ffc0983547
31 changed files with 31 additions and 31 deletions
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_api)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ctrl_ull_conn)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,7 +11,7 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_collision)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ctrl_ull_conn)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -14,7 +14,7 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_le_cte_req)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
|
|
|
@ -18,7 +18,7 @@ if(CONFIG_BT_CTLR_PHY)
|
|||
endif(CONFIG_BT_CTLR_PHY)
|
||||
|
||||
project(bluetooth_ull_llcp_data_length_update)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
if(NOT CONFIG_BT_CTLR_PHY)
|
||||
list(REMOVE_ITEM ll_sw_sources ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c)
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_encrypt)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_feature_exchange)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_feature_exchange)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,7 +11,7 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_invalid)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_le_ping)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_min_used_chans)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_phy_update)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_terminate)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -14,6 +14,6 @@ if(CONFIG_BT_CTLR_LLCP_PER_CONN_TX_CTRL_BUF_NUM GREATER_EQUAL 0)
|
|||
endif(CONFIG_BT_CTLR_LLCP_PER_CONN_TX_CTRL_BUF_NUM)
|
||||
|
||||
project(bluetooth_ull_llcp_tx_buffer_alloc)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_tx_queue)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -31,7 +31,7 @@ if(NO_PHY)
|
|||
endif()
|
||||
|
||||
project(bluetooth_ull_llcp_unsupported)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
|
||||
# Remove ull_llcp_enc.c from compile
|
||||
|
|
|
@ -11,6 +11,6 @@ FILE(GLOB SOURCES
|
|||
)
|
||||
|
||||
project(bluetooth_ull_llcp_version)
|
||||
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
|
||||
include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
|
||||
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
|
||||
|
|
|
@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(base64)
|
||||
set(SOURCES main.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(lib_os_cbprintf)
|
||||
set(SOURCES main.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(crc)
|
||||
set(SOURCES main.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -6,4 +6,4 @@ project(base64)
|
|||
set(SOURCES
|
||||
main.c
|
||||
)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -9,4 +9,4 @@ set(SOURCES
|
|||
dlist.c
|
||||
sflist.c
|
||||
)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(math_extras)
|
||||
set(SOURCES main.c portable.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(lib_net_timeout)
|
||||
set(SOURCES main.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(rbtree)
|
||||
set(SOURCES main.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -5,4 +5,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(timeutil)
|
||||
set(SOURCES main.c test_gmtime.c test_s32.c test_s64.c test_sync.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
|
||||
project(util)
|
||||
set(SOURCES main.c maincxx.cxx ../../../lib/os/dec.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
project(winstream)
|
||||
cmake_minimum_required(VERSION 3.20.0)
|
||||
set(SOURCES main.c)
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
if(BOARD STREQUAL unit_testing)
|
||||
list(APPEND SOURCES src/main_deprecated.c)
|
||||
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(base)
|
||||
else()
|
||||
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
|
@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.20.0)
|
|||
if(BOARD STREQUAL unit_testing)
|
||||
list(APPEND SOURCES src/main.c)
|
||||
|
||||
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(mock)
|
||||
else()
|
||||
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue