From 4e54bf94d0a0651f812ba9cd614d376e43c07c56 Mon Sep 17 00:00:00 2001 From: Hari Limaye Date: Fri, 16 Jul 2021 16:12:14 +0100 Subject: [PATCH] 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. --- .../tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt | 3 +-- .../tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt | 3 +-- .../tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt | 3 +-- .../tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt index 3d45a940b5..e86e725d0c 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt @@ -14,9 +14,7 @@ target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c test_InternetSocket.cpp @@ -30,6 +28,7 @@ target_link_libraries(${TEST_NAME} mbed-stubs mbed-stubs-headers mbed-stubs-netsocket + mbed-stubs-nanostack-libservice gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt index 29a1943dca..d3cd648473 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt @@ -15,9 +15,7 @@ target_sources(${TEST_NAME} ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c test_TCPSocket.cpp @@ -31,6 +29,7 @@ target_link_libraries(${TEST_NAME} mbed-stubs mbed-stubs-headers mbed-stubs-netsocket + mbed-stubs-nanostack-libservice gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt index d0927fbbca..71814fdbfe 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt @@ -16,9 +16,7 @@ target_sources(${TEST_NAME} ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c test_TLSSocketWrapper.cpp @@ -34,6 +32,7 @@ target_link_libraries(${TEST_NAME} mbed-stubs-headers mbed-stubs-mbedtls mbed-stubs-netsocket + mbed-stubs-nanostack-libservice gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt index ad9642806a..7790d74358 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt @@ -16,9 +16,7 @@ target_sources(${TEST_NAME} ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c test_UDPSocket.cpp @@ -32,6 +30,7 @@ target_link_libraries(${TEST_NAME} mbed-stubs mbed-stubs-headers mbed-stubs-netsocket + mbed-stubs-nanostack-libservice gmock_main )