diff --git a/test/bacnet/basic/object/access_credential/src/main.c b/test/bacnet/basic/object/access_credential/src/main.c index 6286dc6e..57425199 100644 --- a/test/bacnet/basic/object/access_credential/src/main.c +++ b/test/bacnet/basic/object/access_credential/src/main.c @@ -28,7 +28,6 @@ static void testAccessCredential(void) BACNET_APPLICATION_DATA_VALUE value = {0}; BACNET_APPLICATION_DATA_VALUE value2 = {0}; const int *required_property = NULL; - BACNET_UNSIGNED_INTEGER unsigned_value = 1; Access_Credential_Init(); rpdata.application_data = &apdu[0]; diff --git a/test/bacnet/basic/object/lc/src/main.c b/test/bacnet/basic/object/lc/src/main.c index 2d983d8b..46d6a245 100644 --- a/test/bacnet/basic/object/lc/src/main.c +++ b/test/bacnet/basic/object/lc/src/main.c @@ -520,6 +520,7 @@ static void testLoadControlStateMachine(void) //TODO: zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL); level = Analog_Output_Present_Value(0); //TODO: Fails: zassert_equal(level, 100, NULL); + (void)level; // TODO: remove when level will be checked } @@ -616,8 +617,8 @@ static bool init_wp_data_and_value( bool status = false; if ((wp_data != NULL) && (value != NULL)) { - memset(&value, 0, sizeof(value)); - memset(&wp_data, 0, sizeof(wp_data)); + memset(value, 0, sizeof(*value)); + memset(wp_data, 0, sizeof(*wp_data)); wp_data->object_type = OBJECT_LOAD_CONTROL; wp_data->object_instance = 0; @@ -676,57 +677,79 @@ static void test_ShedInactive_gets_RcvShedRequests(void) static void test_ShedReqPending_gets_ReconfigPending(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedReqPending_gets_CancelShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedReqPending_gets_CannotMeetShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedReqPending_gets_PrepareToShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedReqPending_gets_AbleToMeetShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedNonCommpliant_gets_UnsuccessfulShedReconfig(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedNonCommpliant_gets_FinishedUnsuccessfulShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedNonCommpliant_gets_CanNowComplyWithShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedCommpliant_gets_FinishedSuccessfulShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedCommpliant_gets_SuccessfulShedReconfig(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } static void test_ShedCommpliant_gets_CanNoLongerComplyWithShed(void) { +#ifndef UNIT_TESTING ztest_test_skip(); +#endif } /** diff --git a/zephyr/tests/bacnet/abort/CMakeLists.txt b/zephyr/tests/bacnet/abort/CMakeLists.txt index 7110583b..f25444e7 100644 --- a/zephyr/tests/bacnet/abort/CMakeLists.txt +++ b/zephyr/tests/bacnet/abort/CMakeLists.txt @@ -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 diff --git a/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt b/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt +++ b/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/alarm_ack/testcase.yaml b/zephyr/tests/bacnet/alarm_ack/testcase.yaml index b1771415..3793f808 100644 --- a/zephyr/tests/bacnet/alarm_ack/testcase.yaml +++ b/zephyr/tests/bacnet/alarm_ack/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.alarm_ack.unit: + tags: bacnet + type: unit bacnet.alarm_ack: tags: bacnet diff --git a/zephyr/tests/bacnet/arf/CMakeLists.txt b/zephyr/tests/bacnet/arf/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/arf/CMakeLists.txt +++ b/zephyr/tests/bacnet/arf/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/arf/testcase.yaml b/zephyr/tests/bacnet/arf/testcase.yaml index 7149eea8..b5b48ce0 100644 --- a/zephyr/tests/bacnet/arf/testcase.yaml +++ b/zephyr/tests/bacnet/arf/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.arf.unit: + tags: bacnet + type: unit bacnet.arf: tags: bacnet diff --git a/zephyr/tests/bacnet/awf/CMakeLists.txt b/zephyr/tests/bacnet/awf/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/awf/CMakeLists.txt +++ b/zephyr/tests/bacnet/awf/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/awf/testcase.yaml b/zephyr/tests/bacnet/awf/testcase.yaml index f7e6ab14..80d3502b 100644 --- a/zephyr/tests/bacnet/awf/testcase.yaml +++ b/zephyr/tests/bacnet/awf/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.awf.unit: + tags: bacnet + type: unit bacnet.awf: tags: bacnet diff --git a/zephyr/tests/bacnet/bacapp/CMakeLists.txt b/zephyr/tests/bacnet/bacapp/CMakeLists.txt index 809ef0fc..17d61b30 100644 --- a/zephyr/tests/bacnet/bacapp/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacapp/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,39 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ) + + add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/bacapp/testcase.yaml b/zephyr/tests/bacnet/bacapp/testcase.yaml index 6c39f5e9..0a172249 100644 --- a/zephyr/tests/bacnet/bacapp/testcase.yaml +++ b/zephyr/tests/bacnet/bacapp/testcase.yaml @@ -1,3 +1,7 @@ tests: + bacnet.bacapp.unit: + tags: bacnet + type: unit + extra_args: BACAPP_PRINT_ENABLED=1 BACAPP_SNPRINTF_ENABLED=1 bacnet.bacapp: tags: bacnet diff --git a/zephyr/tests/bacnet/bacdcode/CMakeLists.txt b/zephyr/tests/bacnet/bacdcode/CMakeLists.txt index 809ef0fc..efaba822 100644 --- a/zephyr/tests/bacnet/bacdcode/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacdcode/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,32 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/bacdcode/testcase.yaml b/zephyr/tests/bacnet/bacdcode/testcase.yaml index 964f283e..eb3bc4bf 100644 --- a/zephyr/tests/bacnet/bacdcode/testcase.yaml +++ b/zephyr/tests/bacnet/bacdcode/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.bacdcode.unit: + tags: bacnet + type: unit bacnet.bacdcode: tags: bacnet diff --git a/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt b/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/bacdevobjpropref/testcase.yaml b/zephyr/tests/bacnet/bacdevobjpropref/testcase.yaml index c989b4fa..66f5ad3e 100644 --- a/zephyr/tests/bacnet/bacdevobjpropref/testcase.yaml +++ b/zephyr/tests/bacnet/bacdevobjpropref/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.bacdevobjpropref.unit: + tags: bacnet + type: unit bacnet.bacdevobjpropref: tags: bacnet diff --git a/zephyr/tests/bacnet/bacerror/CMakeLists.txt b/zephyr/tests/bacnet/bacerror/CMakeLists.txt index 809ef0fc..75ca6192 100644 --- a/zephyr/tests/bacnet/bacerror/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacerror/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,34 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/bacerror/testcase.yaml b/zephyr/tests/bacnet/bacerror/testcase.yaml index 02d6aa2e..b60c0448 100644 --- a/zephyr/tests/bacnet/bacerror/testcase.yaml +++ b/zephyr/tests/bacnet/bacerror/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.bacerror.unit: + tags: bacnet + type: unit bacnet.bacerror: tags: bacnet diff --git a/zephyr/tests/bacnet/bacint/CMakeLists.txt b/zephyr/tests/bacnet/bacint/CMakeLists.txt index 7110583b..f25444e7 100644 --- a/zephyr/tests/bacnet/bacint/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacint/CMakeLists.txt @@ -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 diff --git a/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt b/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt index 809ef0fc..75ca6192 100644 --- a/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,34 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/bacpropstates/testcase.yaml b/zephyr/tests/bacnet/bacpropstates/testcase.yaml index cf2c92b3..3aff9858 100644 --- a/zephyr/tests/bacnet/bacpropstates/testcase.yaml +++ b/zephyr/tests/bacnet/bacpropstates/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.bacpropstates.unit: + tags: bacnet + type: unit bacnet.bacpropstates: tags: bacnet diff --git a/zephyr/tests/bacnet/bacreal/CMakeLists.txt b/zephyr/tests/bacnet/bacreal/CMakeLists.txt index 809ef0fc..128ba91b 100644 --- a/zephyr/tests/bacnet/bacreal/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacreal/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,22 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/bacreal/testcase.yaml b/zephyr/tests/bacnet/bacreal/testcase.yaml index 8be3700d..8167b4a8 100644 --- a/zephyr/tests/bacnet/bacreal/testcase.yaml +++ b/zephyr/tests/bacnet/bacreal/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.bacreal.unit: + tags: bacnet + type: unit bacnet.bacreal: tags: bacnet diff --git a/zephyr/tests/bacnet/bacstr/CMakeLists.txt b/zephyr/tests/bacnet/bacstr/CMakeLists.txt index 7110583b..f25444e7 100644 --- a/zephyr/tests/bacnet/bacstr/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacstr/CMakeLists.txt @@ -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 diff --git a/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt b/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt index 809ef0fc..5d7bdbfd 100644 --- a/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,35 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_BINDING_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_BINDING_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacaddr.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacreal.c + ) + + add_definitions(-DBACNET_ADDRESS_CACHE_FILE=1) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/binding/address/testcase.yaml b/zephyr/tests/bacnet/basic/binding/address/testcase.yaml index 4521e6ab..985a4a02 100644 --- a/zephyr/tests/bacnet/basic/binding/address/testcase.yaml +++ b/zephyr/tests/bacnet/basic/binding/address/testcase.yaml @@ -1,6 +1,13 @@ tests: bacnet.basic.binding.address: tags: bacnet + bacnet.basic.binding.address.unit: + tags: bacnet + type: unit bacnet.basic.binding.address.cache_file: tags: bacnet extra_args: BACNET_ADDRESS_CACHE_FILE=1 + bacnet.basic.binding.address.cache_file.unit: + tags: bacnet + type: unit + extra_args: BACNET_ADDRESS_CACHE_FILE=1 diff --git a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt index 809ef0fc..51e28250 100644 --- a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,40 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/acc/testcase.yaml b/zephyr/tests/bacnet/basic/object/acc/testcase.yaml index eb544b2a..4374f671 100644 --- a/zephyr/tests/bacnet/basic/object/acc/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/acc/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.acc: tags: bacnet + bacnet.basic.object.acc.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt index 809ef0fc..e07fbe07 100644 --- a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,44 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/credential_authentication_factor.c + ${BACNET_SRC}/authentication_factor.c + ${BACNET_SRC}/assigned_access_rights.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/access_credential/testcase.yaml b/zephyr/tests/bacnet/basic/object/access_credential/testcase.yaml index c14378a2..b54e2fe4 100644 --- a/zephyr/tests/bacnet/basic/object/access_credential/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/access_credential/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.access_credential: tags: bacnet + bacnet.basic.object.access_credential.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/access_door/testcase.yaml b/zephyr/tests/bacnet/basic/object/access_door/testcase.yaml index dc281fa8..b53bf429 100644 --- a/zephyr/tests/bacnet/basic/object/access_door/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/access_door/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.access_door: tags: bacnet + bacnet.basic.object.access_door.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt index 809ef0fc..51e28250 100644 --- a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,40 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/access_point/testcase.yaml b/zephyr/tests/bacnet/basic/object/access_point/testcase.yaml index f6b79884..05a2ee69 100644 --- a/zephyr/tests/bacnet/basic/object/access_point/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/access_point/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.access_point: tags: bacnet + bacnet.basic.object.access_point.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt index 809ef0fc..b76599e5 100644 --- a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,42 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_SRC}/access_rule.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/access_rights/testcase.yaml b/zephyr/tests/bacnet/basic/object/access_rights/testcase.yaml index 9e1400f8..55d41573 100644 --- a/zephyr/tests/bacnet/basic/object/access_rights/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/access_rights/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.access_rights: tags: bacnet + bacnet.basic.object.access_rights.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/access_user/testcase.yaml b/zephyr/tests/bacnet/basic/object/access_user/testcase.yaml index 1b76650b..99eb9637 100644 --- a/zephyr/tests/bacnet/basic/object/access_user/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/access_user/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.access_user: tags: bacnet + bacnet.basic.object.access_user.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/access_zone/testcase.yaml b/zephyr/tests/bacnet/basic/object/access_zone/testcase.yaml index 07458bfc..c0ec0f3f 100644 --- a/zephyr/tests/bacnet/basic/object/access_zone/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/access_zone/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.access_zone: tags: bacnet + bacnet.basic.object.access_zone.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt index 809ef0fc..1e3b2505 100644 --- a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,43 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_SRC}/cov.c + ${BACNET_SRC}/memcopy.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/ai/testcase.yaml b/zephyr/tests/bacnet/basic/object/ai/testcase.yaml index 31bee8be..336084ab 100644 --- a/zephyr/tests/bacnet/basic/object/ai/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/ai/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.ai: tags: bacnet + bacnet.basic.object.ai.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/ao/testcase.yaml b/zephyr/tests/bacnet/basic/object/ao/testcase.yaml index 0855c621..b3ac3fc6 100644 --- a/zephyr/tests/bacnet/basic/object/ao/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/ao/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.ao: tags: bacnet + bacnet.basic.object.ao.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/av/testcase.yaml b/zephyr/tests/bacnet/basic/object/av/testcase.yaml index e460f8aa..8d8bf290 100644 --- a/zephyr/tests/bacnet/basic/object/av/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/av/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.av: tags: bacnet + bacnet.basic.object.av.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/bi/testcase.yaml b/zephyr/tests/bacnet/basic/object/bi/testcase.yaml index e727246a..fe45bd2d 100644 --- a/zephyr/tests/bacnet/basic/object/bi/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/bi/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.bi: tags: bacnet + bacnet.basic.object.bi.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/bo/testcase.yaml b/zephyr/tests/bacnet/basic/object/bo/testcase.yaml index 4c3d2c2d..c3d8e5e2 100644 --- a/zephyr/tests/bacnet/basic/object/bo/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/bo/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.bo: tags: bacnet + bacnet.basic.object.bo.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/bv/testcase.yaml b/zephyr/tests/bacnet/basic/object/bv/testcase.yaml index 325bee9e..2d57d680 100644 --- a/zephyr/tests/bacnet/basic/object/bv/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/bv/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.bv: tags: bacnet + bacnet.basic.object.bv.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt index 809ef0fc..8bbd8f6d 100644 --- a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() \ No newline at end of file diff --git a/zephyr/tests/bacnet/basic/object/command/testcase.yaml b/zephyr/tests/bacnet/basic/object/command/testcase.yaml index 25f8c899..46dc0825 100644 --- a/zephyr/tests/bacnet/basic/object/command/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/command/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.command: tags: bacnet + bacnet.basic.object.command.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt index 809ef0fc..dab4c08a 100644 --- a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,43 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_SRC}/authentication_factor.c + ${BACNET_SRC}/authentication_factor_format.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/credential_data_input/testcase.yaml b/zephyr/tests/bacnet/basic/object/credential_data_input/testcase.yaml index 877993da..d395dee0 100644 --- a/zephyr/tests/bacnet/basic/object/credential_data_input/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/credential_data_input/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.credential_data_input: tags: bacnet + bacnet.basic.object.credential_data_input.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt index 809ef0fc..a228d960 100644 --- a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,73 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ${BACNET_TEST_PATH}/stubs.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_SRC}/cov.c + ${BACNET_SRC}/dcc.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/memcopy.c + ${BACNET_SRC}/npdu.c + ${BACNET_SRC}/proplist.c + ${BACNET_SRC}/reject.c + ${BACNET_SRC}/basic/object/acc.c + ${BACNET_SRC}/basic/object/ai.c + ${BACNET_SRC}/basic/object/ao.c + ${BACNET_SRC}/basic/object/av.c + ${BACNET_SRC}/basic/object/bi.c + ${BACNET_SRC}/basic/object/bo.c + ${BACNET_SRC}/basic/object/bv.c + ${BACNET_SRC}/basic/object/channel.c + ${BACNET_SRC}/basic/object/command.c + ${BACNET_SRC}/basic/object/csv.c + ${BACNET_SRC}/basic/object/iv.c + ${BACNET_SRC}/basic/object/lc.c + ${BACNET_SRC}/basic/object/lo.c + ${BACNET_SRC}/basic/object/lsp.c + ${BACNET_SRC}/basic/object/ms-input.c + ${BACNET_SRC}/basic/object/mso.c + ${BACNET_SRC}/basic/object/msv.c + ${BACNET_SRC}/basic/object/netport.c + ${BACNET_SRC}/basic/object/osv.c + ${BACNET_SRC}/basic/object/piv.c + ${BACNET_SRC}/basic/object/schedule.c + ${BACNET_SRC}/basic/object/trendlog.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ${BACNET_TEST_PATH}/stubs.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/device/testcase.yaml b/zephyr/tests/bacnet/basic/object/device/testcase.yaml index 5872db84..6024d43b 100644 --- a/zephyr/tests/bacnet/basic/object/device/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/device/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.device: tags: bacnet + bacnet.basic.object.device.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt index 809ef0fc..015dc479 100644 --- a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,47 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ${BACNET_TEST_PATH}/stubs.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_OBJECT_SRC}/ao.c + ) + + add_definitions(-DUNIT_TESTING) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ${BACNET_TEST_PATH}/stubs.c + # ${BACNET_BASE}/test/ztest/src/ztest.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/lc/testcase.yaml b/zephyr/tests/bacnet/basic/object/lc/testcase.yaml index 65fea29e..7bdd8933 100644 --- a/zephyr/tests/bacnet/basic/object/lc/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/lc/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.lc: tags: bacnet + bacnet.basic.object.lc.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/lo/testcase.yaml b/zephyr/tests/bacnet/basic/object/lo/testcase.yaml index e37dea95..75ec7f5f 100644 --- a/zephyr/tests/bacnet/basic/object/lo/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/lo/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.lo: tags: bacnet + bacnet.basic.object.lo.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/lsp/testcase.yaml b/zephyr/tests/bacnet/basic/object/lsp/testcase.yaml index 4e81e4bd..70fc2536 100644 --- a/zephyr/tests/bacnet/basic/object/lsp/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/lsp/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.lsp: tags: bacnet + bacnet.basic.object.lsp.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/ms-input/testcase.yaml b/zephyr/tests/bacnet/basic/object/ms-input/testcase.yaml index dca474c5..3d7d66a3 100644 --- a/zephyr/tests/bacnet/basic/object/ms-input/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/ms-input/testcase.yaml @@ -1,3 +1,6 @@ tests: - bacnet.ms-input: + bacnet.basic.object.ms-input: tags: bacnet + bacnet.basic.object.ms-input.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/mso/testcase.yaml b/zephyr/tests/bacnet/basic/object/mso/testcase.yaml index 60ccd427..c0170c00 100644 --- a/zephyr/tests/bacnet/basic/object/mso/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/mso/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.mso: tags: bacnet + bacnet.basic.object.mso.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt index 809ef0fc..1e3b2505 100644 --- a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,43 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_SRC}/cov.c + ${BACNET_SRC}/memcopy.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/msv/testcase.yaml b/zephyr/tests/bacnet/basic/object/msv/testcase.yaml index 856ebac3..fb9512b0 100644 --- a/zephyr/tests/bacnet/basic/object/msv/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/msv/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.msv: tags: bacnet + bacnet.basic.object.msv.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt index 809ef0fc..567285bd 100644 --- a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,43 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_SRC}/proplist.c + ${BACNET_SRC}/datalink/bvlc.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/netport/testcase.yaml b/zephyr/tests/bacnet/basic/object/netport/testcase.yaml index 1541af08..aed3e103 100644 --- a/zephyr/tests/bacnet/basic/object/netport/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/netport/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.netport: tags: bacnet + bacnet.basic.object.netport.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt index 809ef0fc..64b06940 100644 --- a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,42 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_BASIC_SRC}/sys/keylist.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/objects/testcase.yaml b/zephyr/tests/bacnet/basic/object/objects/testcase.yaml index a2bcf97a..ec4e8058 100644 --- a/zephyr/tests/bacnet/basic/object/objects/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/objects/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.objects: tags: bacnet + bacnet.basic.object.objects.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/osv/testcase.yaml b/zephyr/tests/bacnet/basic/object/osv/testcase.yaml index 2db7566e..fa732c26 100644 --- a/zephyr/tests/bacnet/basic/object/osv/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/osv/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.osv: tags: bacnet + bacnet.basic.object.osv.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt index 809ef0fc..9713bf07 100644 --- a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/piv/testcase.yaml b/zephyr/tests/bacnet/basic/object/piv/testcase.yaml index 50e0ee02..668ac2e7 100644 --- a/zephyr/tests/bacnet/basic/object/piv/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/piv/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.piv: tags: bacnet + bacnet.basic.object.piv.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt index 809ef0fc..42e80790 100644 --- a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt @@ -11,15 +11,51 @@ string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH) + get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/wp.c + ${BACNET_SRC}/bactimevalue.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/basic/object/schedule/testcase.yaml b/zephyr/tests/bacnet/basic/object/schedule/testcase.yaml index f81a6f67..c3af7949 100644 --- a/zephyr/tests/bacnet/basic/object/schedule/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/schedule/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.basic.object.schedule: tags: bacnet + bacnet.basic.object.schedule.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/cov/CMakeLists.txt b/zephyr/tests/bacnet/cov/CMakeLists.txt index 809ef0fc..7362e38a 100644 --- a/zephyr/tests/bacnet/cov/CMakeLists.txt +++ b/zephyr/tests/bacnet/cov/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,41 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/memcopy.c + ) + + add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/cov/testcase.yaml b/zephyr/tests/bacnet/cov/testcase.yaml index f0abf3ba..cacc5dd9 100644 --- a/zephyr/tests/bacnet/cov/testcase.yaml +++ b/zephyr/tests/bacnet/cov/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.cov.unit: + tags: bacnet + type: unit bacnet.cov: tags: bacnet diff --git a/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt b/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt index 809ef0fc..3b337b3f 100644 --- a/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,45 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_DATALINK_SRC ${BACNET_SRC_PATH} PATH) + get_filename_component(BACNET_SRC ${BACNET_DATALINK_SRC} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ) + + # BIP Options + add_definitions(-DBACDL_BIP=1 -DBACDL_BIP_PORT=47808 + -DBACDL_BIP_ADDRESS_INDEX=0) + # pthreads + add_definitions(-DPOSIX_API=1 -DPTHREAD_IPC=1 -DPOSIX_MQUEUE=1) + # networking + add_definitions(-DNETWORKING=1 -DNET_IPV4=1 -DNET_ARP=1 -DNET_TCP=1 + -DNET_UDP=1 -DNET_DHCPV4=1) + add_definitions(-DNET_MGMT=1 -DNET_MGMT_EVENT=1) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/datalink/bvlc/testcase.yaml b/zephyr/tests/bacnet/datalink/bvlc/testcase.yaml index a740da77..c51f2ffd 100644 --- a/zephyr/tests/bacnet/datalink/bvlc/testcase.yaml +++ b/zephyr/tests/bacnet/datalink/bvlc/testcase.yaml @@ -1,3 +1,6 @@ tests: + bacnet.datalink.bvlc.unit: + tags: bacnet + type: unit bacnet.datalink.bvlc: tags: bacnet diff --git a/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt b/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt index 7110583b..02ddc863 100644 --- a/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt @@ -19,13 +19,15 @@ 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 ${BACNET_TEST_PATH}/src/main.c ) + add_definitions(-DBACDL_MSTP=1) + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) project(${BACNET_NAME}) else() diff --git a/zephyr/tests/bacnet/datetime/CMakeLists.txt b/zephyr/tests/bacnet/datetime/CMakeLists.txt index 809ef0fc..ec277421 100644 --- a/zephyr/tests/bacnet/datetime/CMakeLists.txt +++ b/zephyr/tests/bacnet/datetime/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,32 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() \ No newline at end of file diff --git a/zephyr/tests/bacnet/datetime/testcase.yaml b/zephyr/tests/bacnet/datetime/testcase.yaml index 71c9622d..818c4ff9 100644 --- a/zephyr/tests/bacnet/datetime/testcase.yaml +++ b/zephyr/tests/bacnet/datetime/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.datetime: tags: bacnet + bacnet.datetime.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/dcc/CMakeLists.txt b/zephyr/tests/bacnet/dcc/CMakeLists.txt index 809ef0fc..9a264673 100644 --- a/zephyr/tests/bacnet/dcc/CMakeLists.txt +++ b/zephyr/tests/bacnet/dcc/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() \ No newline at end of file diff --git a/zephyr/tests/bacnet/dcc/testcase.yaml b/zephyr/tests/bacnet/dcc/testcase.yaml index 04bf8a33..f3d9cb03 100644 --- a/zephyr/tests/bacnet/dcc/testcase.yaml +++ b/zephyr/tests/bacnet/dcc/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.dcc: tags: bacnet + bacnet.dcc.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/event/CMakeLists.txt b/zephyr/tests/bacnet/event/CMakeLists.txt index 809ef0fc..4a49dfd5 100644 --- a/zephyr/tests/bacnet/event/CMakeLists.txt +++ b/zephyr/tests/bacnet/event/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,36 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/authentication_factor.c + ${BACNET_SRC}/bacpropstates.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/event/testcase.yaml b/zephyr/tests/bacnet/event/testcase.yaml index 2f37bc55..dd074b8b 100644 --- a/zephyr/tests/bacnet/event/testcase.yaml +++ b/zephyr/tests/bacnet/event/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.event: tags: bacnet + bacnet.event.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/getevent/CMakeLists.txt b/zephyr/tests/bacnet/getevent/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/getevent/CMakeLists.txt +++ b/zephyr/tests/bacnet/getevent/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/getevent/testcase.yaml b/zephyr/tests/bacnet/getevent/testcase.yaml index f72cd6e0..24a8591d 100644 --- a/zephyr/tests/bacnet/getevent/testcase.yaml +++ b/zephyr/tests/bacnet/getevent/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.getevent: tags: bacnet + bacnet.getevent.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/iam/CMakeLists.txt b/zephyr/tests/bacnet/iam/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/iam/CMakeLists.txt +++ b/zephyr/tests/bacnet/iam/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/iam/testcase.yaml b/zephyr/tests/bacnet/iam/testcase.yaml index d0a9a141..f9449322 100644 --- a/zephyr/tests/bacnet/iam/testcase.yaml +++ b/zephyr/tests/bacnet/iam/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.iam: tags: bacnet + bacnet.iam.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/ihave/CMakeLists.txt b/zephyr/tests/bacnet/ihave/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/ihave/CMakeLists.txt +++ b/zephyr/tests/bacnet/ihave/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/ihave/testcase.yaml b/zephyr/tests/bacnet/ihave/testcase.yaml index a7b968d2..26aeb011 100644 --- a/zephyr/tests/bacnet/ihave/testcase.yaml +++ b/zephyr/tests/bacnet/ihave/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.ihave: tags: bacnet + bacnet.ihave.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/indtext/CMakeLists.txt b/zephyr/tests/bacnet/indtext/CMakeLists.txt index 7110583b..f25444e7 100644 --- a/zephyr/tests/bacnet/indtext/CMakeLists.txt +++ b/zephyr/tests/bacnet/indtext/CMakeLists.txt @@ -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 diff --git a/zephyr/tests/bacnet/lighting/CMakeLists.txt b/zephyr/tests/bacnet/lighting/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/lighting/CMakeLists.txt +++ b/zephyr/tests/bacnet/lighting/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/lighting/testcase.yaml b/zephyr/tests/bacnet/lighting/testcase.yaml index e1b0385f..60fdaacd 100644 --- a/zephyr/tests/bacnet/lighting/testcase.yaml +++ b/zephyr/tests/bacnet/lighting/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.lighting: tags: bacnet + bacnet.lighting.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/lso/CMakeLists.txt b/zephyr/tests/bacnet/lso/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/lso/CMakeLists.txt +++ b/zephyr/tests/bacnet/lso/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/lso/testcase.yaml b/zephyr/tests/bacnet/lso/testcase.yaml index de521847..b95e2e00 100644 --- a/zephyr/tests/bacnet/lso/testcase.yaml +++ b/zephyr/tests/bacnet/lso/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.lso: tags: bacnet + bacnet.lso.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/memcopy/CMakeLists.txt b/zephyr/tests/bacnet/memcopy/CMakeLists.txt index 7110583b..f25444e7 100644 --- a/zephyr/tests/bacnet/memcopy/CMakeLists.txt +++ b/zephyr/tests/bacnet/memcopy/CMakeLists.txt @@ -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 diff --git a/zephyr/tests/bacnet/npdu/CMakeLists.txt b/zephyr/tests/bacnet/npdu/CMakeLists.txt index 809ef0fc..9ab6cae0 100644 --- a/zephyr/tests/bacnet/npdu/CMakeLists.txt +++ b/zephyr/tests/bacnet/npdu/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,27 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacint.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/npdu/testcase.yaml b/zephyr/tests/bacnet/npdu/testcase.yaml index 62cd787b..cf997f7c 100644 --- a/zephyr/tests/bacnet/npdu/testcase.yaml +++ b/zephyr/tests/bacnet/npdu/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.npdu: tags: bacnet + bacnet.npdu.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/property/CMakeLists.txt b/zephyr/tests/bacnet/property/CMakeLists.txt index 809ef0fc..2a08820e 100644 --- a/zephyr/tests/bacnet/property/CMakeLists.txt +++ b/zephyr/tests/bacnet/property/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,36 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/proplist.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + add_definitions(-DBACNET_PROPERTY_LISTS=1) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/property/testcase.yaml b/zephyr/tests/bacnet/property/testcase.yaml index 1e9ab734..67adecb5 100644 --- a/zephyr/tests/bacnet/property/testcase.yaml +++ b/zephyr/tests/bacnet/property/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.property: tags: bacnet + bacnet.property.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt index 809ef0fc..e0f6ac16 100644 --- a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt +++ b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,40 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ) + + add_definitions(-DBACAPP_PRINT_ENABLED=1 -DBACAPP_SNPRINTF_ENABLED=1) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/ptransfer/testcase.yaml b/zephyr/tests/bacnet/ptransfer/testcase.yaml index 8eda2656..0771f3c0 100644 --- a/zephyr/tests/bacnet/ptransfer/testcase.yaml +++ b/zephyr/tests/bacnet/ptransfer/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.ptransfer: tags: bacnet + bacnet.ptransfer.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/rd/CMakeLists.txt b/zephyr/tests/bacnet/rd/CMakeLists.txt index 809ef0fc..c9cf82de 100644 --- a/zephyr/tests/bacnet/rd/CMakeLists.txt +++ b/zephyr/tests/bacnet/rd/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,30 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/rd/testcase.yaml b/zephyr/tests/bacnet/rd/testcase.yaml index faab3dd4..7a60d779 100644 --- a/zephyr/tests/bacnet/rd/testcase.yaml +++ b/zephyr/tests/bacnet/rd/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.rd: tags: bacnet + bacnet.rd.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/reject/CMakeLists.txt b/zephyr/tests/bacnet/reject/CMakeLists.txt index 7110583b..f25444e7 100644 --- a/zephyr/tests/bacnet/reject/CMakeLists.txt +++ b/zephyr/tests/bacnet/reject/CMakeLists.txt @@ -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 diff --git a/zephyr/tests/bacnet/rp/CMakeLists.txt b/zephyr/tests/bacnet/rp/CMakeLists.txt index 809ef0fc..837b1067 100644 --- a/zephyr/tests/bacnet/rp/CMakeLists.txt +++ b/zephyr/tests/bacnet/rp/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,30 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() \ No newline at end of file diff --git a/zephyr/tests/bacnet/rp/testcase.yaml b/zephyr/tests/bacnet/rp/testcase.yaml index 89856b9e..87244174 100644 --- a/zephyr/tests/bacnet/rp/testcase.yaml +++ b/zephyr/tests/bacnet/rp/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.rp: tags: bacnet + bacnet.rp.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/rpm/CMakeLists.txt b/zephyr/tests/bacnet/rpm/CMakeLists.txt index 809ef0fc..49af6e1c 100644 --- a/zephyr/tests/bacnet/rpm/CMakeLists.txt +++ b/zephyr/tests/bacnet/rpm/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,40 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ${BACNET_SRC}/bacerror.c + ${BACNET_SRC}/memcopy.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/rpm/testcase.yaml b/zephyr/tests/bacnet/rpm/testcase.yaml index aafda815..29bbd71e 100644 --- a/zephyr/tests/bacnet/rpm/testcase.yaml +++ b/zephyr/tests/bacnet/rpm/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.rpm: tags: bacnet + bacnet.rpm.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/timestamp/CMakeLists.txt b/zephyr/tests/bacnet/timestamp/CMakeLists.txt index 809ef0fc..c94f4afc 100644 --- a/zephyr/tests/bacnet/timestamp/CMakeLists.txt +++ b/zephyr/tests/bacnet/timestamp/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,32 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/timestamp/testcase.yaml b/zephyr/tests/bacnet/timestamp/testcase.yaml index 1b3d9964..63d0c144 100644 --- a/zephyr/tests/bacnet/timestamp/testcase.yaml +++ b/zephyr/tests/bacnet/timestamp/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.timestamp: tags: bacnet + bacnet.timestamp.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/timesync/CMakeLists.txt b/zephyr/tests/bacnet/timesync/CMakeLists.txt index 809ef0fc..77c7a870 100644 --- a/zephyr/tests/bacnet/timesync/CMakeLists.txt +++ b/zephyr/tests/bacnet/timesync/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,33 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/timesync/testcase.yaml b/zephyr/tests/bacnet/timesync/testcase.yaml index 90948fd3..19af1545 100644 --- a/zephyr/tests/bacnet/timesync/testcase.yaml +++ b/zephyr/tests/bacnet/timesync/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.timesync: tags: bacnet + bacnet.timesync.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/whohas/CMakeLists.txt b/zephyr/tests/bacnet/whohas/CMakeLists.txt index 809ef0fc..c9cf82de 100644 --- a/zephyr/tests/bacnet/whohas/CMakeLists.txt +++ b/zephyr/tests/bacnet/whohas/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,30 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/whohas/testcase.yaml b/zephyr/tests/bacnet/whohas/testcase.yaml index c4181951..176a9059 100644 --- a/zephyr/tests/bacnet/whohas/testcase.yaml +++ b/zephyr/tests/bacnet/whohas/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.whohas: tags: bacnet + bacnet.whohas.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/whois/CMakeLists.txt b/zephyr/tests/bacnet/whois/CMakeLists.txt index 809ef0fc..c9cf82de 100644 --- a/zephyr/tests/bacnet/whois/CMakeLists.txt +++ b/zephyr/tests/bacnet/whois/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,30 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/whois/testcase.yaml b/zephyr/tests/bacnet/whois/testcase.yaml index 7be3276e..d598f6d8 100644 --- a/zephyr/tests/bacnet/whois/testcase.yaml +++ b/zephyr/tests/bacnet/whois/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.whois: tags: bacnet + bacnet.whois.unit: + tags: bacnet + type: unit diff --git a/zephyr/tests/bacnet/wp/CMakeLists.txt b/zephyr/tests/bacnet/wp/CMakeLists.txt index 809ef0fc..463fee32 100644 --- a/zephyr/tests/bacnet/wp/CMakeLists.txt +++ b/zephyr/tests/bacnet/wp/CMakeLists.txt @@ -7,6 +7,10 @@ string(REGEX REPLACE "/zephyr/tests/[a-zA-Z_/-]*$" "" BACNET_BASE ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) string(REGEX REPLACE "/zephyr/tests/" "/test/" BACNET_TEST_PATH @@ -16,10 +20,38 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) -include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_NAME}) +if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) + list(APPEND INCLUDE ${BACNET_INCLUDE}) + list(APPEND SOURCES + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) -target_include_directories(app PRIVATE ${BACNET_INCLUDE}) -target_sources(app PRIVATE - ${BACNET_TEST_PATH}/src/main.c - ) + get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH) + list(APPEND SOURCES + ${BACNET_SRC}/bacapp.c + ${BACNET_SRC}/bacdcode.c + ${BACNET_SRC}/bacstr.c + ${BACNET_SRC}/bacint.c + ${BACNET_SRC}/bacreal.c + ${BACNET_SRC}/datetime.c + ${BACNET_SRC}/timestamp.c + ${BACNET_SRC}/basic/sys/days.c + ${BACNET_SRC}/bacdevobjpropref.c + ${BACNET_SRC}/bactext.c + ${BACNET_SRC}/indtext.c + ${BACNET_SRC}/lighting.c + ) + + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) + project(${BACNET_NAME}) +else() + include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) + project(${BACNET_NAME}) + + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_sources(app PRIVATE + ${BACNET_TEST_PATH}/src/main.c + ) +endif() diff --git a/zephyr/tests/bacnet/wp/testcase.yaml b/zephyr/tests/bacnet/wp/testcase.yaml index f61e2f07..3ec2f0e6 100644 --- a/zephyr/tests/bacnet/wp/testcase.yaml +++ b/zephyr/tests/bacnet/wp/testcase.yaml @@ -1,3 +1,6 @@ tests: bacnet.wp: tags: bacnet + bacnet.wp.unit: + tags: bacnet + type: unit