Fixed load control object and unit test. Added recipe to Makefile for Zephyr OS twister unit testing. (#710)
This commit is contained in:
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
|
||||
@@ -27,7 +28,7 @@ if(BOARD STREQUAL unit_testing)
|
||||
${BACNET_SRC_PATH}.c
|
||||
${BACNET_TEST_PATH}/src/main.c
|
||||
${BACNET_TEST_PATH}/stubs.c
|
||||
${BACNET_TEST_PATH}/../mock/device_mock.c
|
||||
${TEST_OBJECT_SRC}/device_mock.c
|
||||
)
|
||||
|
||||
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
|
||||
|
||||
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
|
||||
@@ -26,7 +27,7 @@ if(BOARD STREQUAL unit_testing)
|
||||
list(APPEND SOURCES
|
||||
${BACNET_SRC_PATH}.c
|
||||
${BACNET_TEST_PATH}/src/main.c
|
||||
${BACNET_TEST_PATH}/../mock/device_mock.c
|
||||
${TEST_OBJECT_SRC}/device_mock.c
|
||||
)
|
||||
|
||||
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
|
||||
|
||||
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
|
||||
@@ -26,7 +27,7 @@ if(BOARD STREQUAL unit_testing)
|
||||
list(APPEND SOURCES
|
||||
${BACNET_SRC_PATH}.c
|
||||
${BACNET_TEST_PATH}/src/main.c
|
||||
${BACNET_TEST_PATH}/../mock/device_mock.c
|
||||
${TEST_OBJECT_SRC}/device_mock.c
|
||||
)
|
||||
|
||||
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
|
||||
@@ -26,7 +27,7 @@ if(BOARD STREQUAL unit_testing)
|
||||
list(APPEND SOURCES
|
||||
${BACNET_SRC_PATH}.c
|
||||
${BACNET_TEST_PATH}/src/main.c
|
||||
${BACNET_TEST_PATH}/../mock/device_mock.c
|
||||
${TEST_OBJECT_SRC}/device_mock.c
|
||||
)
|
||||
|
||||
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
|
||||
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
|
||||
# Update include path for this module
|
||||
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
|
||||
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
|
||||
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
|
||||
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
|
||||
|
||||
if(BOARD STREQUAL unit_testing)
|
||||
@@ -30,9 +30,9 @@ if(BOARD STREQUAL unit_testing)
|
||||
list(APPEND SOURCES
|
||||
${BACNET_SRC_PATH}.c
|
||||
${BACNET_TEST_PATH}/src/main.c
|
||||
${BACNET_TEST_PATH}/stubs.c
|
||||
${TEST_OBJECT_SRC}/datetime_local.c
|
||||
${TEST_OBJECT_SRC}/property_test.c
|
||||
${BACNET_TEST_PATH}/../mock/device_mock.c
|
||||
${TEST_OBJECT_SRC}/device_mock.c
|
||||
)
|
||||
|
||||
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
|
||||
|
||||
Reference in New Issue
Block a user