Skip to content

Commit 2f119f9

Browse files
eivindj-nordiceivindj-nordic
committed
tests: use Kconfig to enable modules under test and some cleanup
Use Kconfig to enable modules under test and some cleanup. Signed-off-by: Eivind Jølsgard <[email protected]>
1 parent 2cde6ff commit 2f119f9

File tree

33 files changed

+265
-203
lines changed

33 files changed

+265
-203
lines changed

‎tests/lib/bluetooth/ble_adv/CMakeLists.txt‎

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,56 +11,27 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
1111
project(unit_test_ble_adv)
1212

1313
set(SOFTDEVICE_VARIANT "s115")
14-
set(SOFTDEVICE_INCLUDE_DIR "${ZEPHYR_NRF_BM_MODULE_DIR}/components/softdevice/${SOFTDEVICE_VARIANT}/${SOFTDEVICE_VARIANT}_API/include")
14+
set(SOFTDEVICE_INCLUDE_DIR "${ZEPHYR_NRF_BM_MODULE_DIR}/components/softdevice/\
15+
${SOFTDEVICE_VARIANT}/${SOFTDEVICE_VARIANT}_API/include")
1516

1617
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble.h)
17-
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gatts.h
18-
WORD_EXCLUDE
19-
"__STATIC_INLINE")
20-
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h
21-
WORD_EXCLUDE
22-
"__STATIC_INLINE")
18+
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gatts.h)
19+
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h)
2320
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gap.h)
2421

25-
add_compile_definitions(
26-
SVCALL_AS_NORMAL_FUNCTION=1
27-
NRF54L15_XXAA)
28-
29-
target_compile_definitions( app PRIVATE
30-
CONFIG_BLE_QWR_MAX_ATTR=2
31-
CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT=1
32-
CONFIG_BLE_ADV_PRIMARY_PHY=0x05
33-
CONFIG_BLE_ADV_SECONDARY_PHY=0x05
34-
CONFIG_BLE_ADV_NAME="nRF_BM_CGMS"
35-
CONFIG_BLE_ADV_DIRECTED_ADVERTISING=1
36-
CONFIG_BLE_ADV_USE_WHITELIST=1
37-
CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=1
38-
CONFIG_BLE_ADV_DIRECTED_ADVERTISING=1
39-
CONFIG_BLE_ADV_FAST_ADVERTISING=1
40-
CONFIG_BLE_ADV_FAST_ADVERTISING_INTERVAL=40
41-
CONFIG_BLE_ADV_FAST_ADVERTISING_TIMEOUT=3000
42-
CONFIG_BLE_ADV_SLOW_ADVERTISING=1
43-
CONFIG_BLE_ADV_SLOW_ADVERTISING_INTERVAL=3200
44-
CONFIG_BLE_ADV_SLOW_ADVERTISING_TIMEOUT=18000
45-
CONFIG_BLE_ADV_DIRECTED_ADVERTISING_TIMEOUT=100
46-
CONFIG_BLE_ADV_DIRECTED_ADVERTISING_INTERVAL=32
22+
zephyr_compile_definitions(
23+
SVCALL_AS_NORMAL_FUNCTION
24+
NRF54L15_XXAA
4725
)
4826

4927
# Generate and add test file
5028
test_runner_generate(src/unity_test.c)
5129
target_sources(app PRIVATE src/unity_test.c)
5230

53-
target_include_directories(app PRIVATE ${ZEPHYR_NRF_BM_MODULE_DIR}/include)
54-
target_include_directories(app PRIVATE ${SOFTDEVICE_INCLUDE_DIR})
55-
target_include_directories(app PRIVATE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/mdk)
56-
target_include_directories(app PRIVATE ${ZEPHYR_CMSIS_MODULE_DIR}/CMSIS/Core/Include)
57-
58-
target_sources(app
59-
PRIVATE
60-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_adv/ble_adv.c
61-
)
62-
target_sources(app
63-
PRIVATE
64-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_adv/ble_adv_data.c
31+
zephyr_include_directories(
32+
${ZEPHYR_NRF_BM_MODULE_DIR}/include
33+
${SOFTDEVICE_INCLUDE_DIR}
34+
${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/mdk
35+
${ZEPHYR_CMSIS_MODULE_DIR}/CMSIS/Core/Include
36+
${ZEPHYR_NRF_BM_MODULE_DIR}/include
6537
)
66-
zephyr_include_directories(${ZEPHYR_NRF_BM_MODULE_DIR}/include)

‎tests/lib/bluetooth/ble_adv/Kconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Clear dependencies for BLE_ADV and enable it to allow
2+
# testing the features without enabling the library.
3+
config BLE_ADV
4+
default y
5+
6+
source "Kconfig.zephyr"

‎tests/lib/bluetooth/ble_adv/prj.conf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,19 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_UNITY=y
7+
8+
#CONFIG_BLE_ADV_PRIMARY_PHY=0x05
9+
#CONFIG_BLE_ADV_SECONDARY_PHY=0x05
10+
CONFIG_BLE_ADV_NAME="nRF_BM_CGMS"
11+
CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
12+
CONFIG_BLE_ADV_USE_WHITELIST=y
13+
CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
14+
CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
15+
CONFIG_BLE_ADV_FAST_ADVERTISING=y
16+
CONFIG_BLE_ADV_FAST_ADVERTISING_INTERVAL=40
17+
CONFIG_BLE_ADV_FAST_ADVERTISING_TIMEOUT=3000
18+
CONFIG_BLE_ADV_SLOW_ADVERTISING=y
19+
CONFIG_BLE_ADV_SLOW_ADVERTISING_INTERVAL=3200
20+
CONFIG_BLE_ADV_SLOW_ADVERTISING_TIMEOUT=18000
21+
CONFIG_BLE_ADV_DIRECTED_ADVERTISING_TIMEOUT=100
22+
CONFIG_BLE_ADV_DIRECTED_ADVERTISING_INTERVAL=32

‎tests/lib/bluetooth/ble_conn_params/CMakeLists.txt‎

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,55 +14,25 @@ set(SOFTDEVICE_VARIANT "s115")
1414
set(SOFTDEVICE_INCLUDE_DIR "${ZEPHYR_NRF_BM_MODULE_DIR}/components/softdevice/\
1515
${SOFTDEVICE_VARIANT}/${SOFTDEVICE_VARIANT}_API/include")
1616

17+
zephyr_compile_definitions(
18+
SVCALL_AS_NORMAL_FUNCTION
19+
SUPPRESS_INLINE_IMPLEMENTATION
20+
NRF54L15_XXAA
21+
)
22+
1723
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gatts.h)
1824
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h)
1925
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gap.h)
2026
cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice_handler/nrf_sdh_ble.h)
2127

2228
zephyr_linker_sources(SECTIONS evt_obs.ld)
2329

24-
target_compile_definitions(app PRIVATE
25-
SVCALL_AS_NORMAL_FUNCTION
26-
SUPPRESS_INLINE_IMPLEMENTATION
27-
NRF54L15_XXAA
28-
CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT=64
29-
CONFIG_BLE_CONN_PARAMS_AUTO_GAP_CONN_PARAM_UPDATE=1
30-
CONFIG_BLE_CONN_PARAMS_MIN_CONN_INTERVAL=6
31-
CONFIG_BLE_CONN_PARAMS_MAX_CONN_INTERVAL=256
32-
CONFIG_BLE_CONN_PARAMS_PERIPHERAL_LATENCY=0
33-
CONFIG_BLE_CONN_PARAMS_SUP_TIMEOUT=100
34-
CONFIG_BLE_CONN_PARAMS_MAX_PERIPHERAL_LATENCY_DEVIATION=6
35-
CONFIG_BLE_CONN_PARAMS_MAX_SUP_TIMEOUT_DEVIATION=400
36-
CONFIG_BLE_CONN_PARAMS_NEGOTIATION_RETRIES=2
37-
CONFIG_BLE_CONN_PARAMS_DISCONNECT_ON_FAILURE=1
38-
CONFIG_BLE_CONN_PARAMS_AUTO_ATT_MTU=1
39-
CONFIG_BLE_CONN_PARAMS_ATT_MTU=23
40-
CONFIG_BLE_CONN_PARAMS_INITIATE_ATT_MTU_EXCHANGE=1
41-
CONFIG_BLE_CONN_PARAMS_AUTO_DATA_LENGTH=1
42-
CONFIG_BLE_CONN_PARAMS_DATA_LENGTH_TX=30
43-
CONFIG_BLE_CONN_PARAMS_DATA_LENGTH_RX=30
44-
CONFIG_BLE_CONN_PARAMS_INITIATE_DATA_LENGTH_UPDATE=1
45-
CONFIG_BLE_CONN_PARAMS_AUTO_PHY_UPDATE=1
46-
CONFIG_BLE_CONN_PARAMS_PHY_AUTO=1
47-
CONFIG_BLE_CONN_PARAMS_PHY=0x00
48-
CONFIG_BLE_CONN_PARAMS_INITIATE_PHY_UPDATE=1
49-
CONFIG_NRF_SDH_BLE_GAP_EVENT_LENGTH=3
50-
)
51-
5230
# Generate and add test file
5331
test_runner_generate(src/unity_test.c)
5432
target_sources(app PRIVATE src/unity_test.c)
5533

56-
target_include_directories(app PRIVATE
34+
zephyr_include_directories(
5735
${ZEPHYR_NRF_BM_MODULE_DIR}/include
5836
${SOFTDEVICE_INCLUDE_DIR}
5937
${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/mdk
6038
)
61-
62-
target_sources(app PRIVATE
63-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_conn_params/att_mtu.c
64-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_conn_params/conn_param.c
65-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_conn_params/data_length.c
66-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_conn_params/event.c
67-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_conn_params/phy_mode.c
68-
)

‎tests/lib/bluetooth/ble_conn_params/Kconfig‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Clear dependencies for BLE_CONN_PARAMS and enable it to allow
2+
# testing the features without enabling the library.
3+
config BLE_CONN_PARAMS
4+
default y
5+
6+
config BLE_CONN_PARAMS_AUTO_DATA_LENGTH
7+
default y
8+
9+
# Redefine Kconfigs used by the tested module that is defined in
10+
# other modules we do not want to enable.
11+
config NRF_SDH_BLE_TOTAL_LINK_COUNT
12+
default 5
13+
14+
config NRF_SDH_BLE_GAP_EVENT_LENGTH
15+
default 3
16+
17+
config NRF_SDH_BLE_GATT_MAX_MTU_SIZE
18+
default 24
19+
20+
source "Kconfig.zephyr"

‎tests/lib/bluetooth/ble_conn_params/prj.conf‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,23 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_UNITY=y
7+
8+
CONFIG_BLE_CONN_PARAMS_AUTO_GAP_CONN_PARAM_UPDATE=y
9+
CONFIG_BLE_CONN_PARAMS_MIN_CONN_INTERVAL=6
10+
CONFIG_BLE_CONN_PARAMS_MAX_CONN_INTERVAL=256
11+
CONFIG_BLE_CONN_PARAMS_PERIPHERAL_LATENCY=0
12+
CONFIG_BLE_CONN_PARAMS_SUP_TIMEOUT=100
13+
CONFIG_BLE_CONN_PARAMS_MAX_PERIPHERAL_LATENCY_DEVIATION=6
14+
CONFIG_BLE_CONN_PARAMS_MAX_SUP_TIMEOUT_DEVIATION=400
15+
CONFIG_BLE_CONN_PARAMS_NEGOTIATION_RETRIES=2
16+
CONFIG_BLE_CONN_PARAMS_DISCONNECT_ON_FAILURE=y
17+
CONFIG_BLE_CONN_PARAMS_AUTO_ATT_MTU=y
18+
CONFIG_BLE_CONN_PARAMS_INITIATE_ATT_MTU_EXCHANGE=y
19+
CONFIG_BLE_CONN_PARAMS_DATA_LENGTH_TX=30
20+
CONFIG_BLE_CONN_PARAMS_DATA_LENGTH_RX=30
21+
CONFIG_BLE_CONN_PARAMS_INITIATE_DATA_LENGTH_UPDATE=y
22+
CONFIG_BLE_CONN_PARAMS_AUTO_PHY_UPDATE=y
23+
CONFIG_BLE_CONN_PARAMS_PHY_AUTO=y
24+
CONFIG_BLE_CONN_PARAMS_INITIATE_PHY_UPDATE=y
25+
26+
CONFIG_NRF_SDH_BLE_GAP_EVENT_LENGTH=3

‎tests/lib/bluetooth/ble_conn_state/CMakeLists.txt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,18 @@ set(SOFTDEVICE_VARIANT "s115")
1414
set(SOFTDEVICE_INCLUDE_DIR "${ZEPHYR_NRF_BM_MODULE_DIR}/components/softdevice/\
1515
${SOFTDEVICE_VARIANT}/${SOFTDEVICE_VARIANT}_API/include")
1616

17-
target_compile_definitions(app PRIVATE
17+
zephyr_compile_definitions(
1818
SVCALL_AS_NORMAL_FUNCTION
1919
SUPPRESS_INLINE_IMPLEMENTATION
2020
NRF54L15_XXAA
21-
CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT=64
22-
CONFIG_BLE_CONN_STATE_USER_FLAG_COUNT=24
2321
)
2422

2523
# Generate and add test file
2624
test_runner_generate(src/unity_test.c)
2725
target_sources(app PRIVATE src/unity_test.c)
2826

29-
target_include_directories(app PRIVATE
27+
zephyr_include_directories(
3028
${ZEPHYR_NRF_BM_MODULE_DIR}/include
3129
${SOFTDEVICE_INCLUDE_DIR}
3230
${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/mdk
3331
)
34-
35-
target_sources(app PRIVATE
36-
${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_conn_state/ble_conn_state.c
37-
)

‎tests/lib/bluetooth/ble_conn_state/Kconfig‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Clear dependencies for BLE_CONN_STATE and enable it to allow
2+
# testing the features without enabling the library.
3+
config BLE_CONN_STATE
4+
default y
5+
6+
# Redefine Kconfigs used by the tested module that is defined in
7+
# other modules we do not want to enable.
8+
config NRF_SDH_BLE_TOTAL_LINK_COUNT
9+
default 64
10+
11+
source "Kconfig.zephyr"

‎tests/lib/bluetooth/ble_conn_state/prj.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_UNITY=y
7+
8+
CONFIG_BLE_CONN_STATE_USER_FLAG_COUNT=24

‎tests/lib/bluetooth/ble_gq/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,18 @@ ${SOFTDEVICE_VARIANT}/${SOFTDEVICE_VARIANT}_API/include")
1717
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h)
1818
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gatts.h)
1919

20-
target_compile_definitions(app PRIVATE
20+
zephyr_compile_definitions(
2121
NRF54L15_XXAA
2222
SVCALL_AS_NORMAL_FUNCTION
2323
SUPPRESS_INLINE_IMPLEMENTATION
2424
CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT=2
25-
CONFIG_BLE_GQ_HEAP_SIZE=1024
2625
)
2726

28-
target_include_directories(app PRIVATE
27+
zephyr_include_directories(app PRIVAT
2928
${SOFTDEVICE_INCLUDE_DIR}
3029
${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/mdk
3130
)
3231

3332
# Generate and add test file
3433
test_runner_generate(src/unity_test.c)
3534
target_sources(app PRIVATE src/unity_test.c)
36-
37-
# Unit under test
38-
target_sources(app PRIVATE ${ZEPHYR_NRF_BM_MODULE_DIR}/lib/bluetooth/ble_gq/gatt_queue.c)

0 commit comments

Comments
 (0)