[OSCBS-41] Update to Zephyr v3.2.0 (#382)

Updating to integrate with Zephyr v3.2.0 required:

- Update `west.yml` to import Zephyr v3.2.0 manifest
- Prefix include pathname of ztest.h with `zephyr/`
- Prefix every Zephyr header included pathname with `zephyr/`
- Change all Zephyr tests/samples to use `find_package`
- For unit_testing, use a distinct prj.conf which only references
  Kconfigs defined in the Zephyr repo. (Zephyr constraint.)
- Move ztest headers into a zephyr-prefixed pathname

Co-authored-by: Gregory Shue <gregory.shue@legrand.com>
This commit is contained in:
Greg Shue
2023-01-18 08:50:31 -08:00
committed by GitHub
parent 1a7a810f1a
commit eb36033fd8
262 changed files with 580 additions and 285 deletions
+1
View File
@@ -3,6 +3,7 @@
#
# SPDX-License-Identifier: MIT
name: bacnet
build:
cmake: zephyr
kconfig: zephyr/Kconfig
+2 -2
View File
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: MIT
*/
#include <zephyr.h>
#include <sys/printk.h>
#include <zephyr/kernel.h>
#include <zephyr/sys/printk.h>
void main(void)
{
+1 -1
View File
@@ -7,7 +7,7 @@
/** @file device.c Zephyr specific part of the Base "class". */
#ifdef CONFIG_BACNET_USE_SECTION_ITERABLE_OBJECT_TABLE
#include <zephyr.h>
#include <zephyr/kernel.h>
#endif
#include "bacnet/basic/object/device.h"
#include "object.h"
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#ifndef ZTEST_UNITTEST
#include <zephyr.h>
#include <zephyr/kernel.h>
#else
#include "stdlib.h"
#define k_malloc(a) malloc(a)
+3 -2
View File
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -39,10 +39,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/sys/days.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -39,10 +39,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/sys/days.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -39,10 +39,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/sys/days.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -48,12 +48,13 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,4 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
#CONFIG_BACAPP_PRINT_ENABLED=y
#CONFIG_BACAPP_SNPRINTF_ENABLED=y
+3 -2
View File
@@ -38,10 +38,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/sys/days.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -39,10 +39,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/sys/days.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -40,10 +40,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bacdevobjpropref.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -40,10 +40,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bacdevobjpropref.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -28,10 +28,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -41,10 +41,11 @@ if(BOARD STREQUAL unit_testing)
add_definitions(-DBACNET_ADDRESS_CACHE_FILE=1)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,3 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
#CONFIG_BACNET_ADDRESS_CACHE_FILE=y
@@ -51,10 +51,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -55,10 +55,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -51,10 +51,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -53,10 +53,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -54,10 +54,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -63,10 +63,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bacerror.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -54,10 +54,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -54,10 +54,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,14 +52,15 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
target_sources(app PRIVATE
${BACNET_TEST_PATH}/src/main.c
)
endif()
endif()
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -54,10 +54,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -97,10 +97,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -56,10 +56,11 @@ if(BOARD STREQUAL unit_testing)
add_definitions(-DUNIT_TESTING)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -53,10 +53,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -53,10 +53,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -54,10 +54,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,11 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
# BIP Options
#CONFIG_BACDL_BIP=y
#CONFIG_BACDL_BIP_PORT=47808
#CONFIG_BACDL_BIP_ADDRESS_INDEX=0
# networking
CONFIG_NETWORKING=y
CONFIG_NET_IPV4=y
@@ -53,10 +53,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -53,10 +53,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactimevalue.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -26,10 +26,10 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
@@ -26,10 +26,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_TEST_PATH}/src/main.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_BASE}/src)
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
#CONFIG_BACNETSTACK=y
+3 -2
View File
@@ -52,10 +52,11 @@ if(BOARD STREQUAL unit_testing)
add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})

Some files were not shown because too many files have changed in this diff Show More