michaelh/zephyr
1
0
Fork 0
Code Releases Activity

test: unittest: Fix deprecated ZephyrUnittest

Browse source 
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:
Yuval Peress 2022-06-21 11:50:02 -06:00 • committed by Anas Nashif
commit ffc0983547
31 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/bluetooth/controller/ctrl_api/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_api) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_chmu/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ctrl_ull_conn) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_collision/CMakeLists.txt
View file

@ -11,7 +11,7 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_collision) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_conn_update/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ctrl_ull_conn) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_cte_req/CMakeLists.txt
View file

@ -14,7 +14,7 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_le_cte_req) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)

2
tests/bluetooth/controller/ctrl_data_length_update/CMakeLists.txt
View file

@ -18,7 +18,7 @@ if(CONFIG_BT_CTLR_PHY)
endif(CONFIG_BT_CTLR_PHY) endif(CONFIG_BT_CTLR_PHY)
project(bluetooth_ull_llcp_data_length_update) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
if(NOT CONFIG_BT_CTLR_PHY) if(NOT CONFIG_BT_CTLR_PHY)
list(REMOVE_ITEM ll_sw_sources ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c) list(REMOVE_ITEM ll_sw_sources ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c)

2
tests/bluetooth/controller/ctrl_encrypt/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_encrypt) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_feature_exchange/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_feature_exchange) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_hci/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_feature_exchange) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_invalid/CMakeLists.txt
View file

@ -11,7 +11,7 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_invalid) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_le_ping/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_le_ping) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_min_used_chans/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_min_used_chans) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_phy_update/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_phy_update) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_terminate/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_terminate) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_tx_buffer_alloc/CMakeLists.txt
View file

@ -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) endif(CONFIG_BT_CTLR_LLCP_PER_CONN_TX_CTRL_BUF_NUM)
project(bluetooth_ull_llcp_tx_buffer_alloc) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_tx_queue/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_tx_queue) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/bluetooth/controller/ctrl_unsupported/CMakeLists.txt
View file

@ -31,7 +31,7 @@ if(NO_PHY)
endif() endif()
project(bluetooth_ull_llcp_unsupported) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
# Remove ull_llcp_enc.c from compile # Remove ull_llcp_enc.c from compile

2
tests/bluetooth/controller/ctrl_version/CMakeLists.txt
View file

@ -11,6 +11,6 @@ FILE(GLOB SOURCES
) )
project(bluetooth_ull_llcp_version) 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) include(${ZEPHYR_BASE}/tests/bluetooth/controller/common/defaults_cmake.txt)
target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources}) target_sources(testbinary PRIVATE ${ll_sw_sources} ${mock_sources} ${common_sources})

2
tests/unit/base64/CMakeLists.txt
View file

@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(base64) project(base64)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/cbprintf/CMakeLists.txt
View file

@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(lib_os_cbprintf) project(lib_os_cbprintf)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/crc/CMakeLists.txt
View file

@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(crc) project(crc)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/intmath/CMakeLists.txt
View file

@ -6,4 +6,4 @@ project(base64)
set(SOURCES set(SOURCES
main.c main.c
) )
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/list/CMakeLists.txt
View file

@ -9,4 +9,4 @@ set(SOURCES
dlist.c dlist.c
sflist.c sflist.c
) )
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/math_extras/CMakeLists.txt
View file

@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(math_extras) project(math_extras)
set(SOURCES main.c portable.c) set(SOURCES main.c portable.c)
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/net_timeout/CMakeLists.txt
View file

@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(lib_net_timeout) project(lib_net_timeout)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/rbtree/CMakeLists.txt
View file

@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(rbtree) project(rbtree)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/timeutil/CMakeLists.txt
View file

@ -5,4 +5,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(timeutil) project(timeutil)
set(SOURCES main.c test_gmtime.c test_s32.c test_s64.c test_sync.c) 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})

2
tests/unit/util/CMakeLists.txt
View file

@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.20.0)
project(util) project(util)
set(SOURCES main.c maincxx.cxx ../../../lib/os/dec.c) 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
tests/unit/winstream/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(winstream) project(winstream)
cmake_minimum_required(VERSION 3.20.0) cmake_minimum_required(VERSION 3.20.0)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/ztest/base/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.20.0)
if(BOARD STREQUAL unit_testing) if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES src/main_deprecated.c) 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) project(base)
else() else()
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/ztest/mock/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.20.0)
if(BOARD STREQUAL unit_testing) if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES src/main.c) 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) project(mock)
else() else()
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})