Merge pull request #14896 from ARMmbed/move_connectivity_nanostack_libservice_stub

Move connectivity nanostack libservice stub
2021-07-13 16:19:21 +02:00 · 2021-07-13 16:19:21 +02:00 · 9a591453b3
parent f37b0c485b d488597a97
commit 9a591453b3
24 changed files with 48 additions and 37 deletions
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@ -30,8 +30,6 @@ target_include_directories(mbed-headers-base

 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
        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
@ -48,13 +46,10 @@ target_include_directories(mbed-stubs-headers
        .
 )

-add_subdirectory(connectivity)
-
 add_library(mbed-stubs INTERFACE)

 target_link_libraries(mbed-stubs
    INTERFACE
-        mbed-stubs-connectivity
        mbed-stubs-drivers
        mbed-stubs-events
        mbed-stubs-hal
--- a/UNITTESTS/stubs/connectivity/CMakeLists.txt
+++ b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@ -1,32 +0,0 @@
-# Copyright (c) 2021 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-stubs-connectivity)
-
-target_compile_definitions(mbed-stubs-connectivity
-    PRIVATE
-        DEVICE_SERIAL=1
-        DEVICE_INTERRUPTIN=1
-        MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
-        MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION=true
-        MBED_CONF_LORA_AUTOMATIC_UPLINK_MESSAGE=true
-        MBED_CONF_LORA_TX_MAX_SIZE=255
-        MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
-        MDMTXD=NC
-        MDMRXD=NC
-)
-
-target_sources(mbed-stubs-connectivity
-    PRIVATE
-        ip4tos_stub.c
-        stoip4_stub.c
-)
-
-target_link_libraries(mbed-stubs-connectivity
-    PRIVATE
-        mbed-headers
-        mbed-stubs-headers
-        mbed-stubs-rtos
-        mbed-stubs-platform
-        gtest
-)
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@ -42,4 +42,5 @@ else()
    add_subdirectory(lorawan)
    add_subdirectory(netsocket)
    add_subdirectory(mbedtls)
+    add_subdirectory(libraries)
 endif()
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
--- a/connectivity/libraries/CMakeLists.txt
+++ b/connectivity/libraries/CMakeLists.txt
@ -1,6 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0

+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS)
+endif()
+
 add_subdirectory(mbed-coap)
 add_subdirectory(nanostack-libservice)
 add_subdirectory(ppp)
--- a/connectivity/libraries/tests/UNITTESTS/.mbedignore
+++ b/connectivity/libraries/tests/UNITTESTS/.mbedignore
@ -0,0 +1 @@
+*
--- a/connectivity/libraries/tests/UNITTESTS/CMakeLists.txt
+++ b/connectivity/libraries/tests/UNITTESTS/CMakeLists.txt
@ -0,0 +1,4 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(doubles)
--- a/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt
@ -0,0 +1,23 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-nanostack-libservice INTERFACE)
+
+target_include_directories(mbed-headers-nanostack-libservice
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
+)
+add_library(mbed-stubs-nanostack-libservice)
+
+target_sources(mbed-stubs-nanostack-libservice
+    PRIVATE
+        ip4tos_stub.c
+        stoip4_stub.c
+)
+
+target_link_libraries(mbed-stubs-nanostack-libservice
+    PRIVATE
+        mbed-headers-nanostack-libservice
+        gtest
+)
--- a/connectivity/libraries/tests/UNITTESTS/doubles/ip4tos_stub.c
+++ b/connectivity/libraries/tests/UNITTESTS/doubles/ip4tos_stub.c
--- a/connectivity/libraries/tests/UNITTESTS/doubles/stoip4_stub.c
+++ b/connectivity/libraries/tests/UNITTESTS/doubles/stoip4_stub.c
--- 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-nanostack-libservice
        mbed-headers-mbedtls
        mbed-headers-netsocket
        mbed-stubs
--- 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-nanostack-libservice
        mbed-headers-mbedtls
        mbed-headers-netsocket
        mbed-stubs
--- 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-nanostack-libservice
        mbed-headers-mbedtls
        mbed-headers-netsocket
        mbed-headers
--- 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-nanostack-libservice
        mbed-headers-mbedtls
        mbed-headers-netsocket
        mbed-stubs
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-stubs
        mbed-stubs-headers
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-stubs
        mbed-stubs-headers
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-stubs
        mbed-stubs-headers
--- 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-nanostack-libservice
        mbed-headers-mbedtls
        mbed-headers-netsocket
        mbed-stubs
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-stubs
        mbed-stubs-headers
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-stubs
        mbed-stubs-headers
--- 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-nanostack-libservice
        mbed-headers-mbedtls
        mbed-headers-netsocket
        mbed-stubs
--- 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-nanostack-libservice
        mbed-headers-mbedtls
        mbed-headers-netsocket
        mbed-stubs
--- 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-nanostack-libservice
        mbed-headers-netsocket
        mbed-stubs
        mbed-stubs-headers