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.
2021-07-14 11:01:27 +01:00 · 2021-07-14 11:01:27 +01:00 · 14cab32df4
parent 4e54bf94d0
commit 14cab32df4
15 changed files with 29 additions and 15 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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