From 47943dcf3de5ac0b1888459826f9df10919c5341 Mon Sep 17 00:00:00 2001 From: Hari Limaye Date: Wed, 14 Jul 2021 11:04:22 +0100 Subject: [PATCH 1/4] Unittests: connectivity: remove trailing whitespace --- .../tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt | 4 ++-- .../UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt | 2 +- .../UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt | 2 +- .../tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt | 2 +- .../tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt | 2 +- .../UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt | 4 ++-- .../tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt | 6 +++--- .../tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt | 2 +- .../tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt index 311aa7918f..fa64027f59 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt @@ -6,7 +6,7 @@ set(TEST_NAME netsocket-dtls-socket-unittest) add_executable(${TEST_NAME}) target_compile_definitions(${TEST_NAME} - PRIVATE + PRIVATE MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 ) @@ -24,7 +24,7 @@ target_sources(${TEST_NAME} ${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 + ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c test_DTLSSocket.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt index ce9bc9dc5e..0987ed6898 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt @@ -6,7 +6,7 @@ set(TEST_NAME netsocket-dtls-socket-wrapper-unittest) add_executable(${TEST_NAME}) target_compile_definitions(${TEST_NAME} - PRIVATE + PRIVATE MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt index 356e869d88..74fbc6c0ba 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt @@ -6,7 +6,7 @@ set(TEST_NAME netsocket-ethernet-interface-unittest) add_executable(${TEST_NAME}) target_compile_definitions(${TEST_NAME} - PRIVATE + PRIVATE MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt index d658c702dc..d5d94d6e61 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt @@ -6,7 +6,7 @@ set(TEST_NAME netsocket-iface-dns-socket-unittest) add_executable(${TEST_NAME}) target_compile_definitions(${TEST_NAME} - PRIVATE + PRIVATE MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 DEVICE_EMAC MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt index 53daa2164c..b51d936465 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt @@ -6,7 +6,7 @@ set(TEST_NAME netsocket-internet-socket-unittest) add_executable(${TEST_NAME}) target_compile_definitions(${TEST_NAME} - PRIVATE + PRIVATE MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt index 7f03ae2106..5f4115c488 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt @@ -6,10 +6,10 @@ set(TEST_NAME netsocket-network-interface-unittest) add_executable(${TEST_NAME}) target_compile_definitions(${TEST_NAME} - PRIVATE + PRIVATE MBED_CONF_PLATFORM_CALLBACK_COMPARABLE MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 - + ) target_sources(${TEST_NAME} diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt index b6ac2bffef..02346e4576 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt @@ -7,18 +7,18 @@ add_executable(${TEST_NAME}) target_compile_definitions(${TEST_NAME} PRIVATE - MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 + MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10 ) target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp + ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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 + ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c test_NetworkStack.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt index 2fc2180052..927c66b86b 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt @@ -22,7 +22,7 @@ target_sources(${TEST_NAME} ${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 - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c + ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c test_PPPInterface.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt index 3cad0d68f4..65cff86d59 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt @@ -12,7 +12,7 @@ target_sources(${TEST_NAME} ${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 + ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c test_SocketAddress.cpp ) From 8ad216ae1acc5dd3e6372dd01eb2c21ef1b908cf Mon Sep 17 00:00:00 2001 From: Hari Limaye Date: Wed, 14 Jul 2021 16:39:56 +0100 Subject: [PATCH 2/4] Unittests: Clean up unused sources from netsocket Some source files included when building netsocket unit tests with CMake were determined to be unused by removing the files from target_sources() and verifying that the tests still built and ran successfully. These files have been removed from CMake builds. --- .../tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt | 7 ------- .../UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt | 7 ------- .../UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt | 3 --- .../UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt | 4 ---- .../UNITTESTS/netsocket/InternetSocket/CMakeLists.txt | 1 - .../UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt | 7 ------- .../tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt | 4 ---- .../tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt | 1 - .../tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt | 7 ------- .../UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt | 1 - .../tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt | 1 - 11 files changed, 43 deletions(-) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt index fa64027f59..f0f86f2542 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt @@ -12,19 +12,12 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp ${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/netsocket/source/DTLSSocket.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.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_DTLSSocket.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt index 0987ed6898..abceb8afc2 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt @@ -12,18 +12,11 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp ${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/netsocket/source/DTLSSocketWrapper.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_DTLSSocketWrapper.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt index 74fbc6c0ba..f1c064c870 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt @@ -15,14 +15,11 @@ target_sources(${TEST_NAME} ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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 - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c test_EthernetInterface.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt index d5d94d6e61..c6d1aea0b1 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt @@ -20,13 +20,10 @@ target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterfaceDefaults.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp #nsapi_create_stack ${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/InternetDatagramSocket.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketStats.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/nsapi_dns.cpp @@ -35,7 +32,6 @@ target_sources(${TEST_NAME} ${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 - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c moduletest.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt index b51d936465..3d45a940b5 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt @@ -13,7 +13,6 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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 diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt index 5f4115c488..3e5020a071 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt @@ -14,14 +14,7 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.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 ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c test_NetworkInterface.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt index 927c66b86b..62a0eb4c55 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt @@ -14,15 +14,11 @@ target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/PPPInterface.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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 - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c test_PPPInterface.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt index 8e54e74164..29a1943dca 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt @@ -13,7 +13,6 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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 diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt index 996a83f216..60196273d2 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt @@ -12,17 +12,10 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp ${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/TLSSocket.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_TLSSocket.cpp ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt index 963806da5d..d0927fbbca 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt @@ -13,7 +13,6 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp ${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 diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt index f79024d257..ad9642806a 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt @@ -13,7 +13,6 @@ target_compile_definitions(${TEST_NAME} target_sources(${TEST_NAME} PRIVATE ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp ${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 From 4e54bf94d0a0651f812ba9cd614d376e43c07c56 Mon Sep 17 00:00:00 2001 From: Hari Limaye Date: Fri, 16 Jul 2021 16:12:14 +0100 Subject: [PATCH 3/4] 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 ) From 14cab32df409625fc530c04f107d0f9f24a46548 Mon Sep 17 00:00:00 2001 From: Hari Limaye Date: Wed, 14 Jul 2021 11:01:27 +0100 Subject: [PATCH 4/4] Unittests: Make netsocket test header dependencies explicit The CMake target `mbed-headers` brings in all headers, and we are gradually moving away from it and explicitly use only headers needed by each unit test. --- .../UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt | 4 +++- .../tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt | 4 +++- .../UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt | 4 +++- .../UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt | 3 ++- .../tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt | 4 +++- .../tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt | 3 ++- .../tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt | 1 - .../tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt | 2 +- .../tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt | 3 ++- .../tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt | 1 - .../tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt | 3 ++- .../tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt | 4 +++- .../tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt | 4 +++- .../tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt | 3 ++- .../tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt | 1 - 15 files changed, 29 insertions(+), 15 deletions(-) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt index 98da637f74..daef248395 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt @@ -22,7 +22,9 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-events + mbed-headers-drivers + mbed-headers-rtos mbed-headers-netsocket mbed-headers-cellular mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt index f0f86f2542..96f1335c20 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt @@ -23,7 +23,9 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-events + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt index abceb8afc2..674e3d3d1f 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt @@ -22,7 +22,9 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-events + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt index f1c064c870..a3792f4a8d 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt @@ -25,10 +25,11 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket - mbed-headers mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt index c6d1aea0b1..a601d8346f 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt @@ -38,7 +38,9 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-events + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt index e86e725d0c..cd375fda72 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt @@ -22,7 +22,8 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt index 3e5020a071..d9f4071a32 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt @@ -21,7 +21,6 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt index 02346e4576..f6717a528f 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt @@ -24,7 +24,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-events mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt index 62a0eb4c55..799c28cbf8 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt @@ -24,7 +24,8 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt index 65cff86d59..b4d89cc8be 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt @@ -18,7 +18,6 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt index d3cd648473..b5e8fc9496 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt @@ -23,7 +23,8 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt index 60196273d2..62cf0d3307 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt @@ -21,7 +21,9 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-events + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt index 71814fdbfe..e30aac1a19 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt @@ -24,7 +24,9 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-events + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt index 7790d74358..ab043690a4 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt @@ -24,7 +24,8 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers + mbed-headers-drivers + mbed-headers-rtos mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt index f6a5ef1832..62c0a3fe03 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt @@ -13,7 +13,6 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE - mbed-headers mbed-headers-netsocket mbed-stubs mbed-stubs-headers