Merge pull request #14924 from ARMmbed/refactor_cellular_unittest

Refactor cellular unittest CMake
2021-07-20 10:09:57 +02:00 · 2021-07-20 10:09:57 +02:00 · 2181d7cc77
parent 26889ca2f7 f32a3cbeb7
commit 2181d7cc77
12 changed files with 84 additions and 38 deletions
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@ -23,14 +23,21 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-headers-filesystem
-        mbed-stubs
+        mbed-stubs-platform
+        mbed-stubs-rtos
+        mbed-stubs-events
+        mbed-stubs-drivers
        mbed-stubs-netsocket
        mbed-stubs-cellular
-        mbed-stubs-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
@ -29,14 +29,19 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-netsocket
        mbed-stubs-cellular
-        mbed-stubs-headers
        mbed-stubs-rtos
+        mbed-stubs-platform
+        mbed-stubs-events
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@ -21,13 +21,18 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-netsocket
        mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@ -22,13 +22,18 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-netsocket
        mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@ -22,13 +22,18 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-netsocket
        mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@ -27,13 +27,18 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-nanostack-libservice
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt
@ -12,7 +12,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
        mbed-headers-cellular
        gmock_main
 )
--- a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
@ -13,7 +13,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs-platform
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@ -24,12 +24,18 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
+        mbed-stubs-drivers
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@ -24,25 +24,24 @@ target_compile_definitions(${TEST_NAME}
 target_sources(${TEST_NAME}
    PRIVATE
        ${mbed-os_SOURCE_DIR}/connectivity/cellular/source/framework/device/CellularContext.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
-        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
        cellularcontexttest.cpp
 )

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-nanostack-libservice
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-cellular
        mbed-stubs-netsocket
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@ -27,12 +27,17 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
-        mbed-headers
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
        gmock_main
 )

--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@ -28,12 +28,18 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-netsocket
        mbed-headers-cellular
-        mbed-stubs
        mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
+        mbed-stubs-rtos
        gmock_main
 )