CMake: Move netsocket stub headers to the netsocket doubles dir

Previously all the netsocket stubs headers under mbed-stubs-headers, so this PR move all netsocket stubs headers under netsocket/tests/UNITTESTS/double directory and update CMake to include stubs headers into mbed-stubs-netsocket library to make netsocket stubs to be self-contained.
ARMmbed · Jul 7, 2021 · ef0e3f9 · ef0e3f9
1 parent 68b46f6
commit ef0e3f9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -40,6 +40,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
+        mbed-stubs-netsocket
         mbed-stubs-headers
         gmock_main
 )

diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -10,6 +10,11 @@ target_include_directories(mbed-headers-netsocket
 
 add_library(mbed-stubs-netsocket)
 
+target_include_directories(mbed-stubs-netsocket
+    PUBLIC
+        .
+)
+
 target_sources(mbed-stubs-netsocket
     PRIVATE
         CellularInterface_stub.cpp

diff --git a/UNITTESTS/stubs/ControlPlane_netif_stub.h → ...ITTESTS/doubles/ControlPlane_netif_stub.h b/UNITTESTS/stubs/ControlPlane_netif_stub.h → ...ITTESTS/doubles/ControlPlane_netif_stub.h
diff --git a/UNITTESTS/stubs/EMAC_mock.h → ...ocket/tests/UNITTESTS/doubles/EMAC_mock.h b/UNITTESTS/stubs/EMAC_mock.h → ...ocket/tests/UNITTESTS/doubles/EMAC_mock.h
diff --git a/UNITTESTS/stubs/NetworkStack_stub.h → ...sts/UNITTESTS/doubles/NetworkStack_stub.h b/UNITTESTS/stubs/NetworkStack_stub.h → ...sts/UNITTESTS/doubles/NetworkStack_stub.h
diff --git a/UNITTESTS/stubs/OnboardNetworkStack_mock.h → ...TTESTS/doubles/OnboardNetworkStack_mock.h b/UNITTESTS/stubs/OnboardNetworkStack_mock.h → ...TTESTS/doubles/OnboardNetworkStack_mock.h
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
+        mbed-stubs-netsocket
         mbed-stubs-headers
         gmock_main
 )