Skip to content

Commit 49a9b9a

Browse files
committed
Unittests: Replace files with stubs in netsocket unit tests
Some netsocket unit tests depend on nanostack-libservice library, but should use stubs instead of including the source files. We remove the source files and link to mbed-stubs-nanostack-libservice.
1 parent 925df2f commit 49a9b9a

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ target_sources(${TEST_NAME}
1414
PRIVATE
1515
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
1616
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
17-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
1817
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
19-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2018
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
2119
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2220
test_InternetSocket.cpp
@@ -30,6 +28,7 @@ target_link_libraries(${TEST_NAME}
3028
mbed-stubs
3129
mbed-stubs-headers
3230
mbed-stubs-netsocket
31+
mbed-stubs-nanostack-libservice
3332
gmock_main
3433
)
3534

connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ target_sources(${TEST_NAME}
1515
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
1616
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
1717
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp
18-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
1918
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
20-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2119
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
2220
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2321
test_TCPSocket.cpp
@@ -31,6 +29,7 @@ target_link_libraries(${TEST_NAME}
3129
mbed-stubs
3230
mbed-stubs-headers
3331
mbed-stubs-netsocket
32+
mbed-stubs-nanostack-libservice
3433
gmock_main
3534
)
3635

connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ target_sources(${TEST_NAME}
1616
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
1717
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp
1818
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp
19-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
2019
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
21-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2220
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
2321
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2422
test_TLSSocketWrapper.cpp
@@ -34,6 +32,7 @@ target_link_libraries(${TEST_NAME}
3432
mbed-stubs-headers
3533
mbed-stubs-mbedtls
3634
mbed-stubs-netsocket
35+
mbed-stubs-nanostack-libservice
3736
gmock_main
3837
)
3938

connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ target_sources(${TEST_NAME}
1616
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
1717
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
1818
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
19-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
2019
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
21-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2220
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
2321
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2422
test_UDPSocket.cpp
@@ -32,6 +30,7 @@ target_link_libraries(${TEST_NAME}
3230
mbed-stubs
3331
mbed-stubs-headers
3432
mbed-stubs-netsocket
33+
mbed-stubs-nanostack-libservice
3534
gmock_main
3635
)
3736

0 commit comments

Comments
 (0)