From 14cab32df409625fc530c04f107d0f9f24a46548 Mon Sep 17 00:00:00 2001
From: Hari Limaye <hari.limaye@arm.com>
Date: Wed, 14 Jul 2021 11:01:27 +0100
Subject: [PATCH] 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 98da637f74f..daef2483958 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 f0f86f2542d..96f1335c200 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 abceb8afc20..674e3d3d1fc 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 f1c064c8702..a3792f4a8da 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 c6d1aea0b1a..a601d8346f8 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 e86e725d0c7..cd375fda729 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 3e5020a0713..d9f4071a321 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 02346e45763..f6717a528f5 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 62a0eb4c550..799c28cbf8e 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 65cff86d59f..b4d89cc8be8 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 d3cd648473d..b5e8fc9496b 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 60196273d26..62cf0d33070 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 71814fdbfe0..e30aac1a19a 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 7790d74358c..ab043690a4d 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 f6a5ef1832a..62c0a3fe03c 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