Skip to content

Commit dca2aa7

Browse files
committed
Unit tests: Remove redundant CMake target mbed-headers-base
Individual libraries' `target_h` stub headers have now all been moved from `mbed-headers-base` to `mbed-headers-<library>`. Note: Even though headers previously in `target_h` are technically stubs/fakes too, they are used by not only unit tests but also regular libraries when compiled for unit tests, because no target-specific HAL implementation exists in this case. In order for regular library sources to pick up `target_h` headers, those headers must * have the same names as regular headers * appear first in include paths This is why those headers are part of `mbed-headers-<library>` and not `mbed-stubs-<library>`. Before this refactoring, `mbed-headers-base` was the first in unit tests' include paths.
1 parent 6731f55 commit dca2aa7

File tree

52 files changed

+0
-65
lines changed

Some content is hidden

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

52 files changed

+0
-65
lines changed

UNITTESTS/stubs/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,16 @@
33

44
add_library(mbed-stubs-headers INTERFACE)
55
add_library(mbed-headers INTERFACE)
6-
add_library(mbed-headers-base INTERFACE)
76

87
target_link_libraries(mbed-headers
98
INTERFACE
10-
mbed-headers-base
119
mbed-headers-platform
1210
mbed-headers-drivers
1311
mbed-headers-hal
1412
mbed-headers-events
1513
mbed-headers-rtos
1614
)
1715

18-
target_include_directories(mbed-headers-base
19-
INTERFACE
20-
${mbed-os_SOURCE_DIR}/UNITTESTS/target_h
21-
${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform
22-
${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform/cxxsupport
23-
${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/drivers
24-
${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos/include
25-
${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos
26-
${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/sys
27-
)
28-
29-
3016
target_include_directories(mbed-headers
3117
INTERFACE
3218
${mbed-os_SOURCE_DIR}/features

connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ target_sources(mbed-stubs-cellular
4949

5050
target_link_libraries(mbed-stubs-cellular
5151
PRIVATE
52-
mbed-headers-base
5352
mbed-stubs-platform
5453
mbed-headers-rtos
5554
mbed-headers-drivers

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ target_sources(${TEST_NAME}
2323

2424
target_link_libraries(${TEST_NAME}
2525
PRIVATE
26-
mbed-headers-base
2726
mbed-headers-platform
2827
mbed-headers-events
2928
mbed-headers-rtos

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ target_sources(${TEST_NAME}
2929

3030
target_link_libraries(${TEST_NAME}
3131
PRIVATE
32-
mbed-headers-base
3332
mbed-headers-platform
3433
mbed-headers-events
3534
mbed-headers-rtos

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ target_sources(${TEST_NAME}
2121

2222
target_link_libraries(${TEST_NAME}
2323
PRIVATE
24-
mbed-headers-base
2524
mbed-headers-platform
2625
mbed-headers-events
2726
mbed-headers-rtos

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
2222

2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
25-
mbed-headers-base
2625
mbed-headers-platform
2726
mbed-headers-events
2827
mbed-headers-rtos

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
2222

2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
25-
mbed-headers-base
2625
mbed-headers-platform
2726
mbed-headers-events
2827
mbed-headers-rtos

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ target_sources(${TEST_NAME}
2727

2828
target_link_libraries(${TEST_NAME}
2929
PRIVATE
30-
mbed-headers-base
3130
mbed-headers-platform
3231
mbed-headers-events
3332
mbed-headers-rtos

connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ target_sources(${TEST_NAME}
2626

2727
target_link_libraries(${TEST_NAME}
2828
PRIVATE
29-
mbed-headers-base
3029
mbed-headers-platform
3130
mbed-headers-events
3231
mbed-headers-rtos

connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ target_sources(${TEST_NAME}
3131

3232
target_link_libraries(${TEST_NAME}
3333
PRIVATE
34-
mbed-headers-base
3534
mbed-headers-platform
3635
mbed-headers-events
3736
mbed-headers-rtos

0 commit comments

Comments
 (0)