Skip to content

Commit 2181d7c

Browse files
0xc01700xc0170
authored
Merge pull request #14924 from ARMmbed/refactor_cellular_unittest
Refactor cellular unittest CMake
2 parents 26889ca + f32a3cb commit 2181d7c

File tree

12 files changed

+84
-38
lines changed

12 files changed

+84
-38
lines changed

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,21 @@ target_sources(${TEST_NAME}
2323

2424
target_link_libraries(${TEST_NAME}
2525
PRIVATE
26-
mbed-headers
26+
mbed-headers-base
27+
mbed-headers-platform
28+
mbed-headers-events
29+
mbed-headers-rtos
30+
mbed-headers-drivers
31+
mbed-headers-hal
2732
mbed-headers-netsocket
2833
mbed-headers-cellular
2934
mbed-headers-filesystem
30-
mbed-stubs
35+
mbed-stubs-platform
36+
mbed-stubs-rtos
37+
mbed-stubs-events
38+
mbed-stubs-drivers
3139
mbed-stubs-netsocket
3240
mbed-stubs-cellular
33-
mbed-stubs-headers
3441
gmock_main
3542
)
3643

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@ target_sources(${TEST_NAME}
2929

3030
target_link_libraries(${TEST_NAME}
3131
PRIVATE
32-
mbed-headers
32+
mbed-headers-base
33+
mbed-headers-platform
34+
mbed-headers-events
35+
mbed-headers-rtos
36+
mbed-headers-drivers
37+
mbed-headers-hal
3338
mbed-headers-netsocket
3439
mbed-headers-cellular
35-
mbed-stubs
3640
mbed-stubs-netsocket
3741
mbed-stubs-cellular
38-
mbed-stubs-headers
3942
mbed-stubs-rtos
43+
mbed-stubs-platform
44+
mbed-stubs-events
4045
gmock_main
4146
)
4247

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,18 @@ target_sources(${TEST_NAME}
2121

2222
target_link_libraries(${TEST_NAME}
2323
PRIVATE
24-
mbed-headers
24+
mbed-headers-base
25+
mbed-headers-platform
26+
mbed-headers-events
27+
mbed-headers-rtos
28+
mbed-headers-drivers
29+
mbed-headers-hal
2530
mbed-headers-netsocket
2631
mbed-headers-cellular
27-
mbed-stubs
2832
mbed-stubs-netsocket
2933
mbed-stubs-cellular
30-
mbed-stubs-headers
34+
mbed-stubs-platform
35+
mbed-stubs-events
3136
gmock_main
3237
)
3338

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,18 @@ target_sources(${TEST_NAME}
2222

2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
25-
mbed-headers
25+
mbed-headers-base
26+
mbed-headers-platform
27+
mbed-headers-events
28+
mbed-headers-rtos
29+
mbed-headers-drivers
30+
mbed-headers-hal
2631
mbed-headers-netsocket
2732
mbed-headers-cellular
28-
mbed-stubs
2933
mbed-stubs-netsocket
3034
mbed-stubs-cellular
31-
mbed-stubs-headers
35+
mbed-stubs-platform
36+
mbed-stubs-events
3237
gmock_main
3338
)
3439

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,18 @@ target_sources(${TEST_NAME}
2222

2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
25-
mbed-headers
25+
mbed-headers-base
26+
mbed-headers-platform
27+
mbed-headers-events
28+
mbed-headers-rtos
29+
mbed-headers-drivers
30+
mbed-headers-hal
2631
mbed-headers-netsocket
2732
mbed-headers-cellular
28-
mbed-stubs
2933
mbed-stubs-netsocket
3034
mbed-stubs-cellular
31-
mbed-stubs-headers
35+
mbed-stubs-platform
36+
mbed-stubs-events
3237
gmock_main
3338
)
3439

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,18 @@ target_sources(${TEST_NAME}
2727

2828
target_link_libraries(${TEST_NAME}
2929
PRIVATE
30-
mbed-headers
30+
mbed-headers-base
31+
mbed-headers-platform
32+
mbed-headers-events
33+
mbed-headers-rtos
34+
mbed-headers-drivers
35+
mbed-headers-hal
3136
mbed-headers-nanostack-libservice
3237
mbed-headers-netsocket
3338
mbed-headers-cellular
34-
mbed-stubs
3539
mbed-stubs-cellular
36-
mbed-stubs-headers
40+
mbed-stubs-platform
41+
mbed-stubs-events
3742
gmock_main
3843
)
3944

‎connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt‎

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

1313
target_link_libraries(${TEST_NAME}
1414
PRIVATE
15-
mbed-headers
1615
mbed-headers-cellular
1716
gmock_main
1817
)

‎connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt‎

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

1414
target_link_libraries(${TEST_NAME}
1515
PRIVATE
16-
mbed-headers
1716
mbed-headers-netsocket
1817
mbed-headers-cellular
1918
mbed-stubs-platform

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,18 @@ target_sources(${TEST_NAME}
2424

2525
target_link_libraries(${TEST_NAME}
2626
PRIVATE
27-
mbed-headers
27+
mbed-headers-base
28+
mbed-headers-platform
29+
mbed-headers-events
30+
mbed-headers-rtos
31+
mbed-headers-drivers
32+
mbed-headers-hal
2833
mbed-headers-netsocket
2934
mbed-headers-cellular
30-
mbed-stubs
3135
mbed-stubs-cellular
32-
mbed-stubs-headers
36+
mbed-stubs-platform
37+
mbed-stubs-events
38+
mbed-stubs-drivers
3339
gmock_main
3440
)
3541

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,24 @@ target_compile_definitions(${TEST_NAME}
2424
target_sources(${TEST_NAME}
2525
PRIVATE
2626
${mbed-os_SOURCE_DIR}/connectivity/cellular/source/framework/device/CellularContext.cpp
27-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
28-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
29-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
30-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
31-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
32-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
3327
cellularcontexttest.cpp
3428
)
3529

3630
target_link_libraries(${TEST_NAME}
3731
PRIVATE
38-
mbed-headers
32+
mbed-headers-base
33+
mbed-headers-platform
34+
mbed-headers-events
35+
mbed-headers-rtos
36+
mbed-headers-drivers
37+
mbed-headers-hal
3938
mbed-headers-nanostack-libservice
4039
mbed-headers-netsocket
4140
mbed-headers-cellular
42-
mbed-stubs
4341
mbed-stubs-cellular
4442
mbed-stubs-netsocket
45-
mbed-stubs-headers
43+
mbed-stubs-platform
44+
mbed-stubs-events
4645
gmock_main
4746
)
4847

0 commit comments

Comments
 (0)