Unittests: Clean up unused sources from netsocket

hazzlim · hazzlim · commit 925df2f55c1e · 2021-07-16T16:09:40.000+01:00
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.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
