dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Issues/issue 461 update to zephyr v3 4 0 in ci (#463)

Browse Source 
* [WIP] Remove unit testcases duplicated under non-unit tree

* [WIP] Update west.yml to Zephyr v3.3.0 (twister verified)

* Update CI to Zephyr v3.4.0 w/ reduced module set

- Update zephyr/module.yml to use Zephyr v3.4.0 + cmsis;
- Update tests to use ZTEST_NEW_API for zephyr builds

Verified by:

1. make clean test
2. ./zephyr/scripts/twister -p unit_testing -T bacnet/zephyr/tests/bacnet

---------

Co-authored-by: Gregory Shue <gregory.shue@legrand.com>
This commit is contained in:
Greg Shue
2023-07-26 14:47:01 -07:00
committed by GitHub
parent 3f7a4d2e19
commit dad9e13485
169 changed files with 1299 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephyr/tests/bacnet/abort/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/alarm_ack/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/arf/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/awf/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/bacapp/prj.conf
+1
View File
@@ -1,4 +1,5 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
CONFIG_BACAPP_PRINT_ENABLED=y
CONFIG_BACAPP_SNPRINTF_ENABLED=y
zephyr/tests/bacnet/bacdcode/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/bacdevobjpropref/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/bacerror/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/bacint/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/bacpropstates/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/bacreal/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/bacstr/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/binding/address/prj.conf
+1
View File
@@ -1,3 +1,4 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
CONFIG_BACNET_ADDRESS_CACHE_FILE=y
zephyr/tests/bacnet/basic/object/acc/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_credential/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_door/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_point/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_rights/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_user/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_zone/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/ai/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/ao/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/av/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/bi/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/bo/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/bv/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/color_object/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/color_temperature/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/command/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/credential_data_input/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/device/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/lc/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/lo/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/lsp/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/ms-input/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/mso/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/msv/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/netport/prj.conf
+1
View File
@@ -1,4 +1,5 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
# BIP Options
zephyr/tests/bacnet/basic/object/objects/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/osv/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/piv/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/schedule/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/sys/fifo/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/sys/filename/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/sys/key/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/sys/keylist/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/sys/ringbuf/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/sys/sbuf/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/cov/prj.conf
+1
View File
@@ -1,4 +1,5 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
CONFIG_BACAPP_PRINT_ENABLED=y
CONFIG_BACAPP_SNPRINTF_ENABLED=y
zephyr/tests/bacnet/datalink/bvlc/prj.conf
+1
View File
@@ -1,4 +1,5 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
# BIP Options
zephyr/tests/bacnet/datalink/cobs/prj.conf
+1
View File
@@ -1,3 +1,4 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
CONFIG_BACDL_MSTP=y
zephyr/tests/bacnet/datalink/crc/prj.conf
+1
View File
@@ -1,3 +1,4 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
CONFIG_BACDL_MSTP=y
zephyr/tests/bacnet/datalink/mock/prj.conf
+2 -1
View File
@@ -1,6 +1,7 @@
CONFIG_ZTEST=y
CONFIG_BACNETSTACK=y
CONFIG_ZTEST_NEW_API=y
CONFIG_ZTEST_MOCKING=y
CONFIG_BACNETSTACK=y
# BIP Options
CONFIG_BACDL_BIP=n
zephyr/tests/bacnet/datalink/mock/testcase.yaml
+2 -2
View File
@@ -4,8 +4,8 @@ tests:
bacnet.datalink.mock.unit:
tags: bacnet
type: unit
extra_args: EXTRA_CFLAGS='-Wno-error=array-compare' # for zephyr_v3.0.0 net_if.c
#extra_args: EXTRA_CFLAGS='-Wno-error=array-compare' # for zephyr_v3.0.0 net_if.c
skip: true # TODO: Remove once unit test builds/runs under Zephyr CI
bacnet.datalink.mock:
tags: bacnet
extra_args: EXTRA_CFLAGS='-Wno-error=array-compare' # for zephyr_v3.0.0 net_if.c
#extra_args: EXTRA_CFLAGS='-Wno-error=array-compare' # for zephyr_v3.0.0 net_if.c
zephyr/tests/bacnet/datetime/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/dcc/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/event/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/getevent/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/iam/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/ihave/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/indtext/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/lighting/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/lso/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/memcopy/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/npdu/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/property/prj.conf
+1
View File
@@ -1,3 +1,4 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
CONFIG_BACNET_PROPERTY_LISTS=y
zephyr/tests/bacnet/ptransfer/prj.conf
+1
View File
@@ -1,4 +1,5 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
CONFIG_BACAPP_PRINT_ENABLED=y
CONFIG_BACAPP_SNPRINTF_ENABLED=y
zephyr/tests/bacnet/rd/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/reject/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/rp/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/rpm/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/timestamp/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/timesync/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/whohas/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/whois/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/wp/prj.conf
+1
View File
@@ -1,2 +1,3 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/unit/bacnet/bacerror/CMakeLists.txt
-37
View File
@@ -1,37 +0,0 @@
# Copyright (c) 2022 Legrand North America, LLC.
#
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.20.0)
if(NOT ZEPHYR_CURRENT_MODULE_DIR)
string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" ""
ZEPHYR_CURRENT_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
endif()
if(BOARD STREQUAL unit_testing)
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
set(target testbinary)
else()
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
set(target app)
endif()
project(bacnet_bacerror)
target_sources(${target} PRIVATE
${ZEPHYR_CURRENT_MODULE_DIR}/src/bacnet/bacerror.c
${ZEPHYR_CURRENT_MODULE_DIR}/test/unit/bacnet/bacerror/src/main.c
${ZEPHYR_CURRENT_MODULE_DIR}/test/unit/bacnet/bacerror/src/fakes/bacdcode.c
${CMAKE_CURRENT_SOURCE_DIR}/main.c
)
# NOTE for Zephyr >= v3.2.0:
# - Zephyr unittest builds for target 'testbinary' instead of 'app'.
# - Zephyr unittest does not generate ZEPHYR_<modulename>_MODULE_DIR.
# So we have to use relative paths to get to the source.
target_include_directories(${target} PRIVATE
${ZEPHYR_CURRENT_MODULE_DIR}/test/unit/bacnet/bacerror/src
${ZEPHYR_CURRENT_MODULE_DIR}/src
)
zephyr/tests/unit/bacnet/bacerror/main.c
-1
View File
@@ -1 +0,0 @@
/* This file is intentionally empty */
zephyr/tests/unit/bacnet/bacerror/prj.conf
-1
View File
@@ -1 +0,0 @@
# This file is intentionally empty
zephyr/tests/unit/bacnet/bacerror/testcase.yaml
-3
View File
@@ -1,3 +0,0 @@
tests:
bacnet.bacerror.unit:
type: unit
zephyr/tests/unit/bacnet/bacint/CMakeLists.txt
-26
View File
@@ -1,26 +0,0 @@
# Copyright (c) 2022 Legrand North America, LLC.
#
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.20.0)
if(NOT ZEPHYR_CURRENT_MODULE_DIR)
string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" ""
ZEPHYR_CURRENT_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
endif()
set(SOURCES
${ZEPHYR_CURRENT_MODULE_DIR}/test/unit/bacnet/bacint/src/main.c
)
project(bacnet_bacint)
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
# NOTE for Zephyr >= v3.2.0:
# - Zephyr unittest builds for target 'testbinary' instead of 'app'.
# - Zephyr unittest does not generate ZEPHYR_<modulename>_MODULE_DIR.
# So we have to use relative paths to get to the source.
target_include_directories(testbinary PRIVATE
${ZEPHYR_CURRENT_MODULE_DIR}/src
)
zephyr/tests/unit/bacnet/bacint/prj.conf
-1
View File
@@ -1 +0,0 @@
# This file is intentionally empty
zephyr/tests/unit/bacnet/bacint/testcase.yaml
-3
View File
@@ -1,3 +0,0 @@
tests:
bacnet.bacint.unit:
type: unit