From 5433365b814bb77c834f719b781b0c72576cdcfa Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 5 Jul 2021 03:51:58 -0700 Subject: [PATCH 1/4] CMake: Move netsocket stubs to the netsocket dir Move the connectivity netsocket stubs into the connectivity/netsocket component directory. So we can avoid duplicating the mbed-os source tree in a central UNITTESTS folder. --- UNITTESTS/stubs/NetworkStack_stub.h | 2 +- UNITTESTS/stubs/connectivity/CMakeLists.txt | 8 ------ .../netsocket/tests/UNITTESTS/CMakeLists.txt | 1 + .../tests/UNITTESTS/doubles/CMakeLists.txt | 25 +++++++++++++++++++ .../doubles}/CellularInterface_stub.cpp | 0 .../UNITTESTS/doubles}/MeshInterface_stub.cpp | 0 .../NetworkInterfaceDefaults_stub.cpp | 0 .../doubles}/NetworkInterface_stub.cpp | 0 .../UNITTESTS/doubles}/NetworkStack_stub.cpp | 4 +-- .../UNITTESTS/doubles}/SocketAddress_stub.cpp | 0 .../UNITTESTS/doubles}/SocketStats_Stub.cpp | 0 .../UNITTESTS/doubles}/nsapi_dns_stub.cpp | 0 12 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/CellularInterface_stub.cpp (100%) rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/MeshInterface_stub.cpp (100%) rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/NetworkInterfaceDefaults_stub.cpp (100%) rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/NetworkInterface_stub.cpp (100%) rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/NetworkStack_stub.cpp (96%) rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/SocketAddress_stub.cpp (100%) rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/SocketStats_Stub.cpp (100%) rename {UNITTESTS/stubs/connectivity => connectivity/netsocket/tests/UNITTESTS/doubles}/nsapi_dns_stub.cpp (100%) diff --git a/UNITTESTS/stubs/NetworkStack_stub.h b/UNITTESTS/stubs/NetworkStack_stub.h index 916937e645..d6b630a1d8 100644 --- a/UNITTESTS/stubs/NetworkStack_stub.h +++ b/UNITTESTS/stubs/NetworkStack_stub.h @@ -40,7 +40,7 @@ public: { } - virtual nsapi_error_t get_ip_address(SocketAddress* address) + virtual nsapi_error_t get_ip_address(SocketAddress *address) { address->set_ip_address("127.0.0.1"); return NSAPI_ERROR_OK; diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt index eaf86ac813..41b6d8b1ea 100644 --- a/UNITTESTS/stubs/connectivity/CMakeLists.txt +++ b/UNITTESTS/stubs/connectivity/CMakeLists.txt @@ -19,17 +19,9 @@ target_compile_definitions(mbed-stubs-connectivity target_sources(mbed-stubs-connectivity PRIVATE aes_stub.c - CellularInterface_stub.cpp cipher_stub.c cmac_stub.c ip4tos_stub.c - MeshInterface_stub.cpp - NetworkInterfaceDefaults_stub.cpp - NetworkInterface_stub.cpp - NetworkStack_stub.cpp - nsapi_dns_stub.cpp - SocketAddress_stub.cpp - SocketStats_Stub.cpp stoip4_stub.c ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c ) diff --git a/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt index e23c5d4290..b54cb6bb8c 100644 --- a/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_subdirectory(doubles) add_subdirectory(netsocket) diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt new file mode 100644 index 0000000000..0225b8c0d3 --- /dev/null +++ b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt @@ -0,0 +1,25 @@ +# Copyright (c) 2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-stubs-netsocket) + +target_sources(mbed-stubs-netsocket + PRIVATE + CellularInterface_stub.cpp + MeshInterface_stub.cpp + NetworkInterfaceDefaults_stub.cpp + NetworkInterface_stub.cpp + NetworkStack_stub.cpp + nsapi_dns_stub.cpp + SocketAddress_stub.cpp + SocketStats_Stub.cpp +) + +target_link_libraries(mbed-stubs-netsocket + PRIVATE + mbed-stubs-rtos-headers + mbed-headers + mbed-stubs-headers + mbed-stubs-rtos + gtest +) diff --git a/UNITTESTS/stubs/connectivity/CellularInterface_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/CellularInterface_stub.cpp similarity index 100% rename from UNITTESTS/stubs/connectivity/CellularInterface_stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/CellularInterface_stub.cpp diff --git a/UNITTESTS/stubs/connectivity/MeshInterface_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/MeshInterface_stub.cpp similarity index 100% rename from UNITTESTS/stubs/connectivity/MeshInterface_stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/MeshInterface_stub.cpp diff --git a/UNITTESTS/stubs/connectivity/NetworkInterfaceDefaults_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterfaceDefaults_stub.cpp similarity index 100% rename from UNITTESTS/stubs/connectivity/NetworkInterfaceDefaults_stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterfaceDefaults_stub.cpp diff --git a/UNITTESTS/stubs/connectivity/NetworkInterface_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterface_stub.cpp similarity index 100% rename from UNITTESTS/stubs/connectivity/NetworkInterface_stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterface_stub.cpp diff --git a/UNITTESTS/stubs/connectivity/NetworkStack_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp similarity index 96% rename from UNITTESTS/stubs/connectivity/NetworkStack_stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp index dd68b3e9fb..7d6331a4d9 100644 --- a/UNITTESTS/stubs/connectivity/NetworkStack_stub.cpp +++ b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp @@ -94,7 +94,7 @@ nsapi_error_t NetworkStack::call_in(int delay, mbed::Callback func) return NSAPI_ERROR_UNSUPPORTED; } -nsapi_error_t NetworkStack::get_ip_address(SocketAddress* address) +nsapi_error_t NetworkStack::get_ip_address(SocketAddress *address) { return NSAPI_ERROR_UNSUPPORTED; } @@ -104,7 +104,7 @@ nsapi_error_t NetworkStack::get_ipv6_link_local_address(SocketAddress *address) return NSAPI_ERROR_UNSUPPORTED; } -nsapi_error_t NetworkStack::get_ip_address_if(SocketAddress* address, const char *interface_name) +nsapi_error_t NetworkStack::get_ip_address_if(SocketAddress *address, const char *interface_name) { return NSAPI_ERROR_UNSUPPORTED; } diff --git a/UNITTESTS/stubs/connectivity/SocketAddress_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/SocketAddress_stub.cpp similarity index 100% rename from UNITTESTS/stubs/connectivity/SocketAddress_stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/SocketAddress_stub.cpp diff --git a/UNITTESTS/stubs/connectivity/SocketStats_Stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/SocketStats_Stub.cpp similarity index 100% rename from UNITTESTS/stubs/connectivity/SocketStats_Stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/SocketStats_Stub.cpp diff --git a/UNITTESTS/stubs/connectivity/nsapi_dns_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/nsapi_dns_stub.cpp similarity index 100% rename from UNITTESTS/stubs/connectivity/nsapi_dns_stub.cpp rename to connectivity/netsocket/tests/UNITTESTS/doubles/nsapi_dns_stub.cpp From cb343f9ba96c98553cc58d164186bf403265cb58 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 5 Jul 2021 03:52:52 -0700 Subject: [PATCH 2/4] CMake: Update netsocket, cellular unittest to use mbed-stubs-netsocket Update netsocket and cellular unit tests to link with a mbed-stubs-netsocket library that it depends on instead of link with mbed-stubs which is a group of stubs libraries. --- connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt | 1 + .../UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt | 1 + .../UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt | 1 + .../UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt | 1 + .../UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt | 1 + .../tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt | 1 + .../netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt | 1 + .../netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt | 1 + .../netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt | 1 + 18 files changed, 18 insertions(+) diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt index adbed153d5..f0b911468d 100644 --- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt @@ -52,6 +52,7 @@ target_link_libraries(mbed-stubs-cellular mbed-headers-hal mbed-headers-events mbed-headers-cellular + mbed-stubs-netsocket mbed-stubs-headers gtest ) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt index 17c73c0573..9bb9bb3e20 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt @@ -27,6 +27,7 @@ target_link_libraries(${TEST_NAME} mbed-headers-cellular mbed-headers-filesystem mbed-stubs + mbed-stubs-netsocket mbed-stubs-cellular mbed-stubs-headers mbed-stubs-rtos-headers diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt index 228f89da27..26faee9fe6 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt @@ -32,6 +32,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-headers-cellular mbed-stubs + mbed-stubs-netsocket mbed-stubs-cellular mbed-stubs-headers mbed-stubs-rtos diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt index b497c81a24..4460257c8f 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt @@ -24,6 +24,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-headers-cellular mbed-stubs + mbed-stubs-netsocket mbed-stubs-cellular mbed-stubs-headers gmock_main diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt index cec6b8f905..9126dd109a 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt @@ -25,6 +25,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-headers-cellular mbed-stubs + mbed-stubs-netsocket mbed-stubs-cellular mbed-stubs-headers gmock_main diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt index f8f34eb4f9..cde874b927 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt @@ -25,6 +25,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-headers-cellular mbed-stubs + mbed-stubs-netsocket mbed-stubs-cellular mbed-stubs-headers gmock_main diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt index 9f241884a2..5684dcb804 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt @@ -33,6 +33,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt index 20a0e4cfc3..eddf663b8c 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt @@ -32,6 +32,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt index 2081cf2e94..a35d2b680a 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt index 68ee8fb941..7e2143a971 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt @@ -45,6 +45,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt index 981790d6ea..0abb4d5cc7 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt @@ -28,6 +28,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt index f92e9ed7fe..4d1cd6bb97 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt index f320819f41..d0fe1d614d 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt @@ -27,6 +27,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt index f78c6ccf6b..21c7f1eb89 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt index ca51a12f39..1078a2a007 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt @@ -29,6 +29,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt index b9242f928c..d2bafa145e 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt index 459d5c689b..4b03c3d546 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt @@ -30,6 +30,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt index e62438cd85..d9a8e816af 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt @@ -30,6 +30,7 @@ target_link_libraries(${TEST_NAME} mbed-headers mbed-stubs mbed-stubs-headers + mbed-stubs-netsocket gmock_main ) From 68b46f6199ed982376b544d65a867f8a7d2fe32e Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 5 Jul 2021 04:48:05 -0700 Subject: [PATCH 3/4] CMake: Add mbed-headers-netsocket headers library - Previously, all netsocket headers made as a part of the mbed-headers-connectivity library. To make it easier to separate all the netsocket headers into the separate mbed-headers-netsocket library and keep them, as part of netsocket stubs CMake. This makes the netsocket stubs more self-contained and improves the composition of the library. - Update cellular, netsocket unit tests to link only with a mbed-headers-netsocket library that it depends on instead of link with mbed-headers which is a group of headers libraries. --- UNITTESTS/stubs/CMakeLists.txt | 1 - .../cellular/tests/UNITTESTS/doubles/CMakeLists.txt | 1 + .../framework/AT/at_cellularcontext/CMakeLists.txt | 1 + .../framework/AT/at_cellulardevice/CMakeLists.txt | 1 + .../framework/AT/at_cellularinformation/CMakeLists.txt | 1 + .../framework/AT/at_cellularnetwork/CMakeLists.txt | 1 + .../UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt | 1 + .../framework/AT/at_cellularstack/CMakeLists.txt | 1 + .../tests/UNITTESTS/framework/common/util/CMakeLists.txt | 1 + .../UNITTESTS/framework/device/athandler/CMakeLists.txt | 1 + .../framework/device/cellularcontext/CMakeLists.txt | 1 + .../framework/device/cellulardevice/CMakeLists.txt | 1 + .../framework/device/cellularstatemachine/CMakeLists.txt | 1 + .../netsocket/tests/UNITTESTS/doubles/CMakeLists.txt | 8 ++++++++ .../netsocket/CellularNonIPSocket/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/InternetSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/SocketAddress/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt | 1 + 29 files changed, 35 insertions(+), 1 deletion(-) diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt index 68ab21a0ff..6fdd00b858 100644 --- a/UNITTESTS/stubs/CMakeLists.txt +++ b/UNITTESTS/stubs/CMakeLists.txt @@ -43,7 +43,6 @@ target_include_directories(mbed-headers-connectivity INTERFACE ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice - ${mbed-os_SOURCE_DIR}/connectivity/netsocket/include ${mbed-os_SOURCE_DIR}/connectivity ${mbed-os_SOURCE_DIR}/connectivity/mbedtls ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt index f0b911468d..26c72a7762 100644 --- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt @@ -51,6 +51,7 @@ target_link_libraries(mbed-stubs-cellular mbed-headers-drivers mbed-headers-hal mbed-headers-events + mbed-headers-netsocket mbed-headers-cellular mbed-stubs-netsocket mbed-stubs-headers diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt index 9bb9bb3e20..b2ce284501 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt @@ -24,6 +24,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-headers-filesystem mbed-stubs diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt index 26faee9fe6..4fd647c4a2 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt @@ -30,6 +30,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-netsocket diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt index 4460257c8f..3379dec8a5 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt @@ -22,6 +22,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-netsocket diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt index 9126dd109a..45488bf9f5 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt @@ -23,6 +23,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-netsocket diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt index cde874b927..d40d85ee03 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt @@ -23,6 +23,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-netsocket diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt index a2c2fb8c5c..2361dff4ff 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-cellular diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt index cd77650fde..21cbc64bb4 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt @@ -14,6 +14,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs-platform gmock_main diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt index 428cac1a01..9e78b5f41f 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt @@ -24,6 +24,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-cellular diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt index ddd9181d0b..d79f4de0b2 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt @@ -36,6 +36,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-cellular diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt index 54c9dc7616..272e30a1cc 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt @@ -27,6 +27,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE + mbed-headers-netsocket mbed-headers mbed-headers-cellular mbed-stubs diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt index a5c1b55e4b..ab3529d51a 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt @@ -29,6 +29,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-cellular diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt index 0225b8c0d3..05983abbc7 100644 --- a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt @@ -1,6 +1,13 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-headers-netsocket INTERFACE) + +target_include_directories(mbed-headers-netsocket + INTERFACE + ${mbed-os_SOURCE_DIR}/connectivity/netsocket/include +) + add_library(mbed-stubs-netsocket) target_sources(mbed-stubs-netsocket @@ -17,6 +24,7 @@ target_sources(mbed-stubs-netsocket target_link_libraries(mbed-stubs-netsocket PRIVATE + mbed-headers-netsocket mbed-stubs-rtos-headers mbed-headers mbed-stubs-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt index 2acaddb6bc..238ff60ca7 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt @@ -23,6 +23,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-headers-cellular mbed-stubs mbed-stubs-cellular diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt index 5684dcb804..9564055efa 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt @@ -31,6 +31,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt index eddf663b8c..bfc358b809 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt @@ -30,6 +30,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt index a35d2b680a..6f6478b5b2 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE + mbed-headers-netsocket mbed-headers mbed-stubs mbed-stubs-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt index 7e2143a971..cfaf6ae55f 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt @@ -43,6 +43,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt index 0abb4d5cc7..efed786cc8 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt @@ -26,6 +26,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt index 4d1cd6bb97..80862ec158 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt @@ -29,6 +29,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt index d0fe1d614d..77a21b3cd2 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt @@ -25,6 +25,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt index 21c7f1eb89..ebb0ee452f 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt @@ -29,6 +29,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt index 5ac15b6a54..0e36bc724d 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt @@ -19,6 +19,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers gmock_main diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt index 1078a2a007..b4d6d164e9 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt @@ -27,6 +27,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt index d2bafa145e..8d1fc33329 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt @@ -29,6 +29,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt index 4b03c3d546..56248a39b7 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt index d9a8e816af..e4ffc7e663 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers mbed-stubs-netsocket diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt index d51f755464..f6a5ef1832 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt @@ -14,6 +14,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-netsocket mbed-stubs mbed-stubs-headers gmock_main From ef0e3f99e4a7669e6e0f645be786ababb1b819a8 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 5 Jul 2021 06:37:21 -0700 Subject: [PATCH 4/4] 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. --- .../framework/device/cellularcontext/CMakeLists.txt | 1 + .../netsocket/tests/UNITTESTS/doubles/CMakeLists.txt | 5 +++++ .../tests/UNITTESTS/doubles}/ControlPlane_netif_stub.h | 0 .../netsocket/tests/UNITTESTS/doubles}/EMAC_mock.h | 0 .../netsocket/tests/UNITTESTS/doubles}/NetworkStack_stub.h | 0 .../tests/UNITTESTS/doubles}/OnboardNetworkStack_mock.h | 0 .../UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt | 1 + 7 files changed, 7 insertions(+) rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/ControlPlane_netif_stub.h (100%) rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/EMAC_mock.h (100%) rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/NetworkStack_stub.h (100%) rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/OnboardNetworkStack_mock.h (100%) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt index d79f4de0b2..9d8c2aa34a 100644 --- 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 index 05983abbc7..634caa0b3d 100644 --- 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 b/connectivity/netsocket/tests/UNITTESTS/doubles/ControlPlane_netif_stub.h similarity index 100% rename from UNITTESTS/stubs/ControlPlane_netif_stub.h rename to connectivity/netsocket/tests/UNITTESTS/doubles/ControlPlane_netif_stub.h diff --git a/UNITTESTS/stubs/EMAC_mock.h b/connectivity/netsocket/tests/UNITTESTS/doubles/EMAC_mock.h similarity index 100% rename from UNITTESTS/stubs/EMAC_mock.h rename to connectivity/netsocket/tests/UNITTESTS/doubles/EMAC_mock.h diff --git a/UNITTESTS/stubs/NetworkStack_stub.h b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h similarity index 100% rename from UNITTESTS/stubs/NetworkStack_stub.h rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h diff --git a/UNITTESTS/stubs/OnboardNetworkStack_mock.h b/connectivity/netsocket/tests/UNITTESTS/doubles/OnboardNetworkStack_mock.h similarity index 100% rename from UNITTESTS/stubs/OnboardNetworkStack_mock.h rename to connectivity/netsocket/tests/UNITTESTS/doubles/OnboardNetworkStack_mock.h diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt index 238ff60ca7..98da637f74 100644 --- 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 )