Skip to content

Commit 3b39162

Browse files
lemreylemrey
committed
tests: remove unnecessary compile definitions
Remove NRF54L15_XXAA and SUPPRESS_INLINE_IMPLEMENTATION definitions when they are not necessary. Add a comment where they are, to specify which file needs them. Signed-off-by: Emanuele Di Santo <emdi@nordicsemi.no>
1 parent d3d1b2f commit 3b39162

18 files changed

Lines changed: 3 additions & 80 deletions

File tree

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ softdevice_unity_setup()
1515
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble.h)
1616
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gap.h)
1717

18-
zephyr_compile_definitions(
19-
NRF54L15_XXAA
20-
SUPPRESS_INLINE_IMPLEMENTATION
21-
)
22-
2318
# Generate and add test file
2419
test_runner_generate(src/unity_test.c)
2520
target_sources(app PRIVATE src/unity_test.c)

‎tests/unit/lib/bluetooth/ble_adv_data/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ softdevice_unity_setup()
1515
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble.h)
1616
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gap.h)
1717

18-
zephyr_compile_definitions(
19-
NRF54L15_XXAA
20-
SUPPRESS_INLINE_IMPLEMENTATION
21-
)
22-
2318
# Generate and add test file
2419
test_runner_generate(src/unity_test.c)
2520
target_sources(app PRIVATE src/unity_test.c)

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h)
1717
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gap.h)
1818
cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice_handler/nrf_sdh_ble.h)
1919

20-
zephyr_compile_definitions(
21-
NRF54L15_XXAA
22-
SUPPRESS_INLINE_IMPLEMENTATION
23-
)
24-
2520
# Generate and add test file
2621
test_runner_generate(src/unity_test.c)
2722
target_sources(app PRIVATE src/unity_test.c)

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ project(unit_test_ble_conn_state)
1212

1313
softdevice_unity_setup()
1414

15-
zephyr_compile_definitions(
16-
NRF54L15_XXAA
17-
SUPPRESS_INLINE_IMPLEMENTATION
18-
)
19-
2015
# Generate and add test file
2116
test_runner_generate(src/unity_test.c)
2217
target_sources(app PRIVATE src/unity_test.c)

‎tests/unit/lib/bluetooth/ble_db_discovery/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ softdevice_unity_setup(VARIANT s145)
1414

1515
cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/bluetooth/ble_gq.h)
1616

17-
zephyr_compile_definitions(
18-
NRF54L15_XXAA
19-
SUPPRESS_INLINE_IMPLEMENTATION
20-
)
21-
2217
# Generate and add test file
2318
test_runner_generate(src/unity_test.c)
2419
target_sources(app PRIVATE src/unity_test.c)

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ softdevice_unity_setup()
1515
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h)
1616
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gatts.h)
1717

18-
zephyr_compile_definitions(
19-
NRF54L15_XXAA
20-
SUPPRESS_INLINE_IMPLEMENTATION
21-
)
22-
2318
# Generate and add test file
2419
test_runner_generate(src/unity_test.c)
2520
target_sources(app PRIVATE src/unity_test.c)

‎tests/unit/lib/bluetooth/ble_qwr/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble.h)
1616
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gatts.h)
1717
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h)
1818

19-
zephyr_compile_definitions(
20-
NRF54L15_XXAA
21-
SUPPRESS_INLINE_IMPLEMENTATION
22-
)
23-
2419
# Generate and add test file
2520
test_runner_generate(src/unity_test.c)
2621
target_sources(app PRIVATE src/unity_test.c)

‎tests/unit/lib/bluetooth/ble_radio_notif/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ softdevice_unity_setup()
1515
cmock_handle(mocks/cmsis.h)
1616
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/nrf_soc.h)
1717

18+
# NRF54L15_XXAA and SUPPRESS_INLINE_IMPLEMENTATION are required by nrf_soc.h.
19+
# SWI02_IRQn is provided by the mocked cmsis.h.
1820
zephyr_compile_definitions(
1921
NRF54L15_XXAA
2022
SUPPRESS_INLINE_IMPLEMENTATION

‎tests/unit/lib/bluetooth/ble_scan/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gattc.h)
1818
cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice_handler/nrf_sdh_ble.h)
1919
cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/bluetooth/ble_adv_data.h)
2020

21-
zephyr_compile_definitions(
22-
NRF54L15_XXAA
23-
SUPPRESS_INLINE_IMPLEMENTATION
24-
)
25-
2621
# Generate and add test file
2722
test_runner_generate(src/unity_test.c)
2823
target_sources(app PRIVATE src/unity_test.c)

‎tests/unit/subsys/bluetooth/services/ble_bas/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ softdevice_unity_setup()
1414

1515
cmock_handle(${SOFTDEVICE_INCLUDE_DIR}/ble_gatts.h)
1616

17-
zephyr_compile_definitions(
18-
NRF54L15_XXAA
19-
SUPPRESS_INLINE_IMPLEMENTATION
20-
)
21-
2217
# Generate and add test file
2318
test_runner_generate(src/unity_test.c)
2419
target_sources(app PRIVATE src/unity_test.c)

0 commit comments

Comments
 (0)