CMake: Move connectivity/cellular stubs to the mbed-os/connectivity/cellular dir

Move the connectivity cellular into the connectivity/cellular component directory. So we can avoid duplicating the mbed-os source tree in a central UNITTESTS folder.
2021-06-25 03:57:41 -07:00 · 2021-06-25 03:57:41 -07:00 · fa0ab53692
parent 8902a0c866
commit fa0ab53692
26 changed files with 54 additions and 16 deletions
--- a/UNITTESTS/stubs/connectivity/CMakeLists.txt
+++ b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@ -7,8 +7,6 @@ target_compile_definitions(mbed-stubs-connectivity
    PRIVATE
        DEVICE_SERIAL=1
        DEVICE_INTERRUPTIN=1
-        MBED_CONF_CELLULAR_USE_SMS=1
-        MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
        MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
        MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION=true
        MBED_CONF_LORA_AUTOMATIC_UPLINK_MESSAGE=true
@ -21,19 +19,7 @@ target_compile_definitions(mbed-stubs-connectivity
 target_sources(mbed-stubs-connectivity
    PRIVATE
        aes_stub.c
-        AT_CellularContext_stub.cpp
-        AT_CellularDevice_stub.cpp
-        AT_CellularInformation_stub.cpp
-        AT_CellularNetwork_stub.cpp
-        AT_CellularSMS_stub.cpp
-        AT_CellularStack_stub.cpp
-        AT_ControlPlane_netif_stub.cpp
-        ATHandler_stub.cpp
-        CellularContext_stub.cpp
-        CellularDevice_stub.cpp
        CellularInterface_stub.cpp
-        CellularStateMachine_stub.cpp
-        CellularUtil_stub.cpp
        cipher_stub.c
        cmac_stub.c
        ip4tos_stub.c
--- a/connectivity/cellular/tests/UNITTESTS/CMakeLists.txt
+++ b/connectivity/cellular/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(framework)
--- a/connectivity/cellular/tests/UNITTESTS/doubles/ATHandler_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/ATHandler_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularContext_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularContext_stub.cpp
@ -171,7 +171,8 @@ bool AT_CellularContext::get_context()
    return true;
 }

-const char* AT_CellularContext::get_nonip_context_type_str() {
+const char *AT_CellularContext::get_nonip_context_type_str()
+{
    return "Non-IP";
 }

--- a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularDevice_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularDevice_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularInformation_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularInformation_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularNetwork_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularNetwork_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularSMS_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularSMS_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularStack_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularStack_stub.cpp
@ -31,7 +31,7 @@ AT_CellularStack::~AT_CellularStack()
 {
 }

-nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress* address)
+nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress *address)
 {
    return NSAPI_ERROR_UNSUPPORTED;
 }
--- a/connectivity/cellular/tests/UNITTESTS/doubles/AT_ControlPlane_netif_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/AT_ControlPlane_netif_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@ -0,0 +1,39 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-stubs-cellular)
+
+target_compile_definitions(mbed-stubs-cellular
+    PRIVATE
+        DEVICE_SERIAL=1
+        DEVICE_INTERRUPTIN=1
+        MBED_CONF_CELLULAR_USE_SMS=1
+        MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
+        MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
+        MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
+        MDMTXD=NC
+        MDMRXD=NC
+)
+
+target_sources(mbed-stubs-cellular
+    PRIVATE
+        AT_CellularContext_stub.cpp
+        AT_CellularDevice_stub.cpp
+        AT_CellularInformation_stub.cpp
+        AT_CellularNetwork_stub.cpp
+        AT_CellularSMS_stub.cpp
+        AT_CellularStack_stub.cpp
+        AT_ControlPlane_netif_stub.cpp
+        ATHandler_stub.cpp
+        CellularContext_stub.cpp
+        CellularDevice_stub.cpp
+        CellularStateMachine_stub.cpp
+        CellularUtil_stub.cpp        
+)
+
+target_link_libraries(mbed-stubs-cellular
+    PRIVATE
+        mbed-headers
+        mbed-stubs-headers
+        gtest
+)
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CellularContext_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CellularContext_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CellularDevice_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CellularDevice_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CellularStateMachine_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CellularStateMachine_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CellularUtil_stub.cpp
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CellularUtil_stub.cpp
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@ -25,6 +25,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        mbed-stubs-rtos-headers
        gmock_main
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        mbed-stubs-rtos
        gmock_main
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@ -23,6 +23,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        gmock_main
 )
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@ -24,6 +24,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        gmock_main
 )
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@ -24,6 +24,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        gmock_main
 )
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@ -29,6 +29,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        mbed-stubs-rtos-headers
        gmock_main
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@ -25,6 +25,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        gmock_main
 )
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@ -37,6 +37,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        gmock_main
 )
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@ -29,6 +29,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        gmock_main
 )
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@ -30,6 +30,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        mbed-stubs-rtos-headers
        gmock_main
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
@ -24,6 +24,7 @@ target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
        mbed-stubs
+        mbed-stubs-cellular
        mbed-stubs-headers
        gmock_main
 )