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

Issues/issue 593 update to zephyr v3 6 0 (#601)

Browse Source 
* [WIP] update manifest to zephyr v3.6.0

* [WIP] Deprecated ZTEST_NEW_API adjustments

Zephyr v3.6.0 removed Kconfig ZTEST_NEW_API.
The old ZTEST API is still used by non-Zephyr builds,
so the config setting is moved from `prj.conf` to
the test's CMakeLists.txt as `add_compile_definitions()`.

Verified by:

1. make clean all test

2. ./zephyr/scripts/twister -p unit_testing \
        -T bacnet-stack/zephyr/tests/

---------

Co-authored-by: Gregory Shue <gregory.shue@legrand.com>
This commit is contained in:
Greg Shue
2024-03-15 08:29:05 -07:00
committed by GitHub
parent f0760e2b96
commit 78f7340266
160 changed files with 293 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt
+2
View File
@@ -67,3 +67,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/acc/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt
+2
View File
@@ -71,3 +71,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/access_credential/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/access_door/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt
+2
View File
@@ -67,3 +67,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/access_point/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt
+2
View File
@@ -69,3 +69,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/access_rights/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/access_user/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/access_zone/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt
+2
View File
@@ -70,3 +70,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/ai/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/ao/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/av/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/av/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/bi/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt
+2
View File
@@ -79,3 +79,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/bo/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/bv/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt
+2
View File
@@ -72,3 +72,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt
+2
View File
@@ -71,3 +71,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/color_object/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt
+2
View File
@@ -71,3 +71,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/color_temperature/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/command/CMakeLists.txt
+2
View File
@@ -77,3 +77,5 @@ else()
${TEST_OBJECT_SRC}/property_test.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/command/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt
+2
View File
@@ -79,3 +79,5 @@ else()
${TEST_OBJECT_SRC}/property_test.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/credential_data_input/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/device/CMakeLists.txt
+2
View File
@@ -117,3 +117,5 @@ else()
#${BACNET_TEST_PATH}/stubs.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/device/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt
+2
View File
@@ -74,3 +74,5 @@ else()
# ${BACNET_BASE}/test/ztest/src/ztest.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/lc/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt
+2
View File
@@ -71,3 +71,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/lo/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt
+2
View File
@@ -69,3 +69,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/lsp/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
+2
View File
@@ -69,3 +69,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/ms-input/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/mso/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
+2
View File
@@ -69,3 +69,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/msv/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt
+2
View File
@@ -79,3 +79,5 @@ else()
${TEST_OBJECT_SRC}/property_test.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/netport/prj.conf
-1
View File
@@ -1,5 +1,4 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
# BIP Options
zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt
+2
View File
@@ -69,3 +69,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/objects/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/osv/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt
+2
View File
@@ -68,3 +68,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/piv/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt
+2
View File
@@ -78,3 +78,5 @@ else()
${TEST_OBJECT_SRC}/property_test.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig
zephyr/tests/bacnet/basic/object/schedule/prj.conf
-1
View File
@@ -1,3 +1,2 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt
+2
View File
@@ -72,3 +72,5 @@ else()
${BACNET_TEST_PATH}/src/main.c
)
endif()
add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig