Skip to content

Commit 45c4439

Browse files
skargskarg
committed
Refactor BACnet test CMakeLists.txt files to streamline source file inclusion
- Updated multiple CMakeLists.txt files in the BACnet test directories to replace relative source paths with absolute paths from the BACNET_BASE directory. - Removed unnecessary commented-out code and consolidated source file lists for clarity and maintainability. - Ensured that all relevant BACnet source files are included for unit testing across various test cases, including IAM, IHAVE, INDText, Lighting, LSO, Memcopy, NPDU, Property, PTransfer, RD, Reject, RP, RPM, Timestamp, TimeSync, WhoHas, and WhoIs. - Added main.c file references for unit testing in each test directory.
1 parent c1f1c1e commit 45c4439

75 files changed

Lines changed: 1522 additions & 1975 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎zephyr/tests/bacnet/abort/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ string(REGEX REPLACE
1818
${CMAKE_CURRENT_SOURCE_DIR})
1919
get_filename_component(BACNET_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
2020

21-
2221
if(BOARD STREQUAL unit_testing)
2322
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2423
list(APPEND INCLUDE ${BACNET_INCLUDE})
2524
list(APPEND SOURCES
26-
${BACNET_SRC_PATH}.c
27-
${BACNET_TEST_PATH}/src/main.c
2825
${BACNET_BASE}/src/bacnet/abort.c
26+
${BACNET_TEST_PATH}/src/main.c
2927
)
3028

3129
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/alarm_ack/CMakeLists.txt‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,16 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
30-
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
3128
${BACNET_BASE}/src/bacnet/alarm_ack.c
32-
)
33-
34-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
35-
list(APPEND SOURCES
36-
${BACNET_SRC}/bacdcode.c
37-
${BACNET_SRC}/bacstr.c
38-
${BACNET_SRC}/bacint.c
39-
${BACNET_SRC}/bacreal.c
40-
${BACNET_SRC}/datetime.c
41-
${BACNET_SRC}/timestamp.c
42-
${BACNET_SRC}/basic/sys/days.c
29+
${BACNET_BASE}/src/bacnet/bacdcode.c
30+
${BACNET_BASE}/src/bacnet/bacint.c
31+
${BACNET_BASE}/src/bacnet/bacreal.c
32+
${BACNET_BASE}/src/bacnet/bacstr.c
33+
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
34+
${BACNET_BASE}/src/bacnet/datetime.c
35+
${BACNET_BASE}/src/bacnet/basic/sys/days.c
36+
${BACNET_BASE}/src/bacnet/timestamp.c
37+
${BACNET_TEST_PATH}/src/main.c
4338
)
4439

4540
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/arf/CMakeLists.txt‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,13 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
3028
${BACNET_BASE}/src/bacnet/arf.c
29+
${BACNET_BASE}/src/bacnet/bacdcode.c
30+
${BACNET_BASE}/src/bacnet/bacint.c
31+
${BACNET_BASE}/src/bacnet/bacreal.c
32+
${BACNET_BASE}/src/bacnet/bacstr.c
3133
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
32-
)
33-
34-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
35-
list(APPEND SOURCES
36-
${BACNET_SRC}/bacdcode.c
37-
${BACNET_SRC}/bacstr.c
38-
${BACNET_SRC}/bacint.c
39-
${BACNET_SRC}/bacreal.c
40-
${BACNET_SRC}/datetime.c
41-
${BACNET_SRC}/timestamp.c
42-
${BACNET_SRC}/basic/sys/days.c
34+
${BACNET_TEST_PATH}/src/main.c
4335
)
4436

4537
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/awf/CMakeLists.txt‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,13 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
30-
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
3128
${BACNET_BASE}/src/bacnet/awf.c
32-
)
33-
34-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
35-
list(APPEND SOURCES
36-
${BACNET_SRC}/bacdcode.c
37-
${BACNET_SRC}/bacstr.c
38-
${BACNET_SRC}/bacint.c
39-
${BACNET_SRC}/bacreal.c
40-
${BACNET_SRC}/datetime.c
41-
${BACNET_SRC}/timestamp.c
42-
${BACNET_SRC}/basic/sys/days.c
29+
${BACNET_BASE}/src/bacnet/bacdcode.c
30+
${BACNET_BASE}/src/bacnet/bacint.c
31+
${BACNET_BASE}/src/bacnet/bacreal.c
32+
${BACNET_BASE}/src/bacnet/bacstr.c
33+
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
34+
${BACNET_TEST_PATH}/src/main.c
4335
)
4436

4537
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/bacapp/CMakeLists.txt‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,38 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
30-
${BACNET_BASE}/src/bacnet/authentication_factor.c
3128
${BACNET_BASE}/src/bacnet/bacapp.c
32-
${BACNET_BASE}/src/bacnet/datalink/bvlc.c
29+
${BACNET_BASE}/src/bacnet/access_rule.c
30+
${BACNET_BASE}/src/bacnet/authentication_factor.c
3331
${BACNET_BASE}/src/bacnet/authentication_factor_format.c
34-
)
35-
36-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
37-
list(APPEND SOURCES
38-
${BACNET_SRC}/access_rule.c
39-
${BACNET_SRC}/bacaction.c
40-
${BACNET_SRC}/bacaddr.c
41-
${BACNET_SRC}/bacdcode.c
42-
${BACNET_SRC}/bacdest.c
43-
${BACNET_SRC}/bacint.c
44-
${BACNET_SRC}/baclog.c
45-
${BACNET_SRC}/bacreal.c
46-
${BACNET_SRC}/bacstr.c
47-
${BACNET_SRC}/channel_value.c
48-
${BACNET_SRC}/datetime.c
49-
${BACNET_SRC}/timestamp.c
50-
${BACNET_SRC}/basic/sys/days.c
51-
${BACNET_SRC}/bacdevobjpropref.c
52-
${BACNET_SRC}/bactext.c
53-
${BACNET_SRC}/indtext.c
54-
${BACNET_SRC}/lighting.c
55-
${BACNET_SRC}/shed_level.c
56-
${BACNET_SRC}/timer_value.c
57-
${BACNET_SRC}/hostnport.c
58-
${BACNET_SRC}/dailyschedule.c
59-
${BACNET_SRC}/weeklyschedule.c
60-
${BACNET_SRC}/calendar_entry.c
61-
${BACNET_SRC}/special_event.c
62-
${BACNET_SRC}/basic/sys/bigend.c
63-
${BACNET_SRC}/bactimevalue.c
64-
${BACNET_SRC}/secure_connect.c
32+
${BACNET_BASE}/src/bacnet/bacaction.c
33+
${BACNET_BASE}/src/bacnet/bacaddr.c
34+
${BACNET_BASE}/src/bacnet/bacdest.c
35+
${BACNET_BASE}/src/bacnet/bacdcode.c
36+
${BACNET_BASE}/src/bacnet/bacdevobjpropref.c
37+
${BACNET_BASE}/src/bacnet/bacint.c
38+
${BACNET_BASE}/src/bacnet/baclog.c
39+
${BACNET_BASE}/src/bacnet/bacreal.c
40+
${BACNET_BASE}/src/bacnet/bacstr.c
41+
${BACNET_BASE}/src/bacnet/bactext.c
42+
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
43+
${BACNET_BASE}/src/bacnet/datetime.c
44+
${BACNET_BASE}/src/bacnet/basic/sys/days.c
45+
${BACNET_BASE}/src/bacnet/hostnport.c
46+
${BACNET_BASE}/src/bacnet/lighting.c
47+
${BACNET_BASE}/src/bacnet/shed_level.c
48+
${BACNET_BASE}/src/bacnet/timer_value.c
49+
${BACNET_BASE}/src/bacnet/timestamp.c
50+
${BACNET_BASE}/src/bacnet/indtext.c
51+
${BACNET_BASE}/src/bacnet/datalink/bvlc.c
52+
${BACNET_BASE}/src/bacnet/weeklyschedule.c
53+
${BACNET_BASE}/src/bacnet/bactimevalue.c
54+
${BACNET_BASE}/src/bacnet/dailyschedule.c
55+
${BACNET_BASE}/src/bacnet/calendar_entry.c
56+
${BACNET_BASE}/src/bacnet/special_event.c
57+
${BACNET_BASE}/src/bacnet/channel_value.c
58+
${BACNET_BASE}/src/bacnet/secure_connect.c
59+
${BACNET_TEST_PATH}/src/main.c
6560
)
6661

6762
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/bacdcode/CMakeLists.txt‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,14 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
3028
${BACNET_BASE}/src/bacnet/bacdcode.c
31-
)
32-
33-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
34-
list(APPEND SOURCES
35-
${BACNET_SRC}/bacint.c
36-
${BACNET_SRC}/bacreal.c
37-
${BACNET_SRC}/bacstr.c
38-
${BACNET_SRC}/datetime.c
39-
${BACNET_SRC}/basic/sys/days.c
40-
${BACNET_SRC}/basic/sys/bigend.c
29+
${BACNET_BASE}/src/bacnet/bacint.c
30+
${BACNET_BASE}/src/bacnet/bacreal.c
31+
${BACNET_BASE}/src/bacnet/bacstr.c
32+
${BACNET_BASE}/src/bacnet/datetime.c
33+
${BACNET_BASE}/src/bacnet/basic/sys/days.c
34+
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
35+
${BACNET_TEST_PATH}/src/main.c
4136
)
4237

4338
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,37 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
30-
${BACNET_BASE}/src/bacnet/baclog.c
28+
${BACNET_BASE}/src/bacnet/bacdevobjpropref.c
3129
${BACNET_BASE}/src/bacnet/access_rule.c
32-
${BACNET_BASE}/src/bacnet/weeklyschedule.c
33-
${BACNET_BASE}/src/bacnet/shed_level.c
34-
${BACNET_BASE}/src/bacnet/dailyschedule.c
35-
${BACNET_BASE}/src/bacnet/bacdest.c
3630
${BACNET_BASE}/src/bacnet/authentication_factor.c
37-
${BACNET_BASE}/src/bacnet/timer_value.c
31+
${BACNET_BASE}/src/bacnet/authentication_factor_format.c
32+
${BACNET_BASE}/src/bacnet/bacaction.c
3833
${BACNET_BASE}/src/bacnet/bacaddr.c
3934
${BACNET_BASE}/src/bacnet/bacapp.c
35+
${BACNET_BASE}/src/bacnet/bacdcode.c
36+
${BACNET_BASE}/src/bacnet/bacdest.c
37+
${BACNET_BASE}/src/bacnet/bacint.c
38+
${BACNET_BASE}/src/bacnet/baclog.c
39+
${BACNET_BASE}/src/bacnet/bacreal.c
40+
${BACNET_BASE}/src/bacnet/bacstr.c
41+
${BACNET_BASE}/src/bacnet/bactext.c
42+
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
43+
${BACNET_BASE}/src/bacnet/datetime.c
44+
${BACNET_BASE}/src/bacnet/basic/sys/days.c
45+
${BACNET_BASE}/src/bacnet/indtext.c
46+
${BACNET_BASE}/src/bacnet/hostnport.c
4047
${BACNET_BASE}/src/bacnet/lighting.c
48+
${BACNET_BASE}/src/bacnet/shed_level.c
49+
${BACNET_BASE}/src/bacnet/timer_value.c
50+
${BACNET_BASE}/src/bacnet/timestamp.c
51+
${BACNET_BASE}/src/bacnet/weeklyschedule.c
4152
${BACNET_BASE}/src/bacnet/bactimevalue.c
42-
${BACNET_BASE}/src/bacnet/hostnport.c
43-
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
53+
${BACNET_BASE}/src/bacnet/dailyschedule.c
54+
${BACNET_BASE}/src/bacnet/calendar_entry.c
4455
${BACNET_BASE}/src/bacnet/special_event.c
4556
${BACNET_BASE}/src/bacnet/channel_value.c
46-
${BACNET_BASE}/src/bacnet/authentication_factor_format.c
47-
${BACNET_BASE}/src/bacnet/indtext.c
4857
${BACNET_BASE}/src/bacnet/secure_connect.c
49-
${BACNET_BASE}/src/bacnet/bactext.c
50-
${BACNET_BASE}/src/bacnet/calendar_entry.c
51-
${BACNET_BASE}/src/bacnet/bacdevobjpropref.c
52-
${BACNET_BASE}/src/bacnet/bacaction.c
53-
)
54-
55-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
56-
list(APPEND SOURCES
57-
${BACNET_SRC}/bacdcode.c
58-
${BACNET_SRC}/bacstr.c
59-
${BACNET_SRC}/bacint.c
60-
${BACNET_SRC}/bacreal.c
61-
${BACNET_SRC}/datetime.c
62-
${BACNET_SRC}/timestamp.c
63-
${BACNET_SRC}/basic/sys/days.c
58+
${BACNET_TEST_PATH}/src/main.c
6459
)
6560

6661
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/bacerror/CMakeLists.txt‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,15 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
30-
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
3128
${BACNET_BASE}/src/bacnet/bacerror.c
32-
)
33-
34-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
35-
list(APPEND SOURCES
36-
${BACNET_SRC}/bacdcode.c
37-
${BACNET_SRC}/bacstr.c
38-
${BACNET_SRC}/bacint.c
39-
${BACNET_SRC}/bacreal.c
40-
${BACNET_SRC}/datetime.c
41-
${BACNET_SRC}/timestamp.c
42-
${BACNET_SRC}/basic/sys/days.c
43-
${BACNET_SRC}/bacdevobjpropref.c
29+
${BACNET_BASE}/src/bacnet/abort.c
30+
${BACNET_BASE}/src/bacnet/bacdcode.c
31+
${BACNET_BASE}/src/bacnet/bacint.c
32+
${BACNET_BASE}/src/bacnet/bacreal.c
33+
${BACNET_BASE}/src/bacnet/bacstr.c
34+
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
35+
${BACNET_BASE}/src/bacnet/reject.c
36+
${BACNET_TEST_PATH}/src/main.c
4437
)
4538

4639
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/bacint/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ string(REGEX REPLACE
1818
${CMAKE_CURRENT_SOURCE_DIR})
1919
get_filename_component(BACNET_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
2020

21-
2221
if(BOARD STREQUAL unit_testing)
2322
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2423
list(APPEND INCLUDE ${BACNET_INCLUDE})
2524
list(APPEND SOURCES
26-
${BACNET_SRC_PATH}.c
27-
${BACNET_TEST_PATH}/src/main.c
2825
${BACNET_BASE}/src/bacnet/bacint.c
2926
${BACNET_BASE}/src/bacnet/bacstr.c
27+
${BACNET_TEST_PATH}/src/main.c
3028
)
3129

3230
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

‎zephyr/tests/bacnet/bacpropstates/CMakeLists.txt‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,13 @@ if(BOARD STREQUAL unit_testing)
2525
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
2626
list(APPEND INCLUDE ${BACNET_INCLUDE})
2727
list(APPEND SOURCES
28-
${BACNET_SRC_PATH}.c
29-
${BACNET_TEST_PATH}/src/main.c
3028
${BACNET_BASE}/src/bacnet/bacpropstates.c
29+
${BACNET_BASE}/src/bacnet/bacdcode.c
30+
${BACNET_BASE}/src/bacnet/bacint.c
31+
${BACNET_BASE}/src/bacnet/bacreal.c
32+
${BACNET_BASE}/src/bacnet/bacstr.c
3133
${BACNET_BASE}/src/bacnet/basic/sys/bigend.c
32-
)
33-
34-
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
35-
list(APPEND SOURCES
36-
${BACNET_SRC}/bacdcode.c
37-
${BACNET_SRC}/bacstr.c
38-
${BACNET_SRC}/bacint.c
39-
${BACNET_SRC}/bacreal.c
40-
${BACNET_SRC}/datetime.c
41-
${BACNET_SRC}/timestamp.c
42-
${BACNET_SRC}/basic/sys/days.c
43-
${BACNET_SRC}/bacdevobjpropref.c
34+
${BACNET_TEST_PATH}/src/main.c
4435
)
4536

4637
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")

0 commit comments

Comments
 (0)