Fix regressive zephyr unit tests (#339)

This commit is contained in:
Mikhail Antropov
2022-09-21 17:08:37 +03:00
committed by GitHub
parent e79871129a
commit 32a312f974
53 changed files with 159 additions and 40 deletions
+4
View File
@@ -308,6 +308,10 @@ set(BACNETSTACK_SRCS
${BACNETSTACK_SRC}/bacnet/wp.h
${BACNETSTACK_SRC}/bacnet/wpm.c
${BACNETSTACK_SRC}/bacnet/wpm.h
${BACNETSTACK_SRC}/bacnet/weeklyschedule.c
${BACNETSTACK_SRC}/bacnet/weeklyschedule.h
${BACNETSTACK_SRC}/bacnet/dailyschedule.c
${BACNETSTACK_SRC}/bacnet/dailyschedule.h
)
set(BACNETSTACK_BASIC_SRCS
@@ -41,6 +41,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1)
@@ -45,6 +45,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -49,6 +49,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/assigned_access_rights.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -45,6 +45,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -47,6 +47,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_SRC}/access_rule.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -48,6 +48,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/cov.c
${BACNET_SRC}/memcopy.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -48,6 +48,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -48,6 +48,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -48,6 +48,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/authentication_factor.c
${BACNET_SRC}/authentication_factor_format.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -91,6 +91,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/sys/keylist.c
${BACNET_SRC}/basic/tsm/tsm.c
${BACNET_SRC}/datalink/bvlc.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -48,6 +48,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_OBJECT_SRC}/ao.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
add_definitions(-DUNIT_TESTING)
@@ -61,7 +65,7 @@ else()
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
target_sources(app PRIVATE
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/stubs.c
# ${BACNET_TEST_PATH}/stubs.c
# ${BACNET_BASE}/test/ztest/src/ztest.c
)
endif()
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -47,6 +47,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -1,4 +1,3 @@
# SPDX-License-Identifier: MIT
cmake_minimum_required(VERSION 3.13.1)
@@ -48,6 +47,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/cov.c
${BACNET_SRC}/memcopy.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -48,6 +48,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/proplist.c
${BACNET_SRC}/datalink/bvlc.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -47,6 +47,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_BASIC_SRC}/sys/keylist.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -46,6 +46,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -47,6 +47,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_SRC}/bactimevalue.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
@@ -1,6 +1,6 @@
tests:
bacnet.filename.unit:
bacnet.basic.sys.filename.unit:
tags: bacnet
type: unit
bacnet.filename:
bacnet.basic.sys.filename:
tags: bacnet
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
+5
View File
@@ -43,6 +43,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/memcopy.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1)
@@ -39,6 +39,9 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/timestamp.c
${BACNET_SRC}/basic/sys/days.c
${BACNET_SRC}/bacdevobjpropref.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
)
# BIP Options
@@ -42,6 +42,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1)
+5
View File
@@ -44,6 +44,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/bacerror.c
${BACNET_SRC}/memcopy.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
+5
View File
@@ -42,6 +42,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/dailyschedule.c
${BACNET_SRC}/weeklyschedule.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)