From 6cf1211b3aa5e9975bab18f74e61ce9759ac387d Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 15 Jul 2021 06:15:56 -0700 Subject: [PATCH 1/3] CMake: Limit at cellular unittest to use mock what it depends Update AT cellular unit tests CMake depends on a mock, which is required for the test instead of depending on the group of mbed-stubs, mbed-headers, mbed_stub_headers, libraries. --- .../framework/AT/at_cellularcontext/CMakeLists.txt | 13 ++++++++++--- .../framework/AT/at_cellulardevice/CMakeLists.txt | 11 ++++++++--- .../AT/at_cellularinformation/CMakeLists.txt | 11 ++++++++--- .../framework/AT/at_cellularnetwork/CMakeLists.txt | 11 ++++++++--- .../framework/AT/at_cellularsms/CMakeLists.txt | 11 ++++++++--- .../framework/AT/at_cellularstack/CMakeLists.txt | 11 ++++++++--- 6 files changed, 50 insertions(+), 18 deletions(-) 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 ac50d03653..b94dce45c1 100644 --- 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 ) 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 4fd647c4a2..176bf21e4e 100644 --- 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 ) 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 3379dec8a5..ff616ebd5b 100644 --- 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 ) 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 45488bf9f5..034d61bd41 100644 --- 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 ) 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 d40d85ee03..a82f0ee76b 100644 --- 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 ) 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 b7c7244f5e..9176840f6f 100644 --- 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 ) From 27bfa906c6b09520a06aebb317c148e57e9d1fc5 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 15 Jul 2021 06:16:19 -0700 Subject: [PATCH 2/3] CMake: Limit cellular common unit tests to use mocks what it depends Update cellular common unit tests CMake depends on a mock, which is required for the test instead of depending on the group of mbed-headers libraries. --- .../tests/UNITTESTS/framework/common/list/CMakeLists.txt | 1 - .../tests/UNITTESTS/framework/common/util/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt index 59ee4cb238..ec135a522e 100644 --- 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 ) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt index 21cbc64bb4..e243c5f932 100644 --- 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 From f32a3cbeb73b0988fa0cdcedd9ca69992d7e8e78 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 15 Jul 2021 06:16:47 -0700 Subject: [PATCH 3/3] CMake: Limit cellular device cmake to use mocks/sources what it depends Update cellular device unit tests CMake depends on a mock, which is required for the test instead of depending on the group of mbed-stubs, mbed-headers, mbed_stub_headers, libraries. Limit the cellular context unit test CMake target_sources to keep only required sources --- .../framework/device/athandler/CMakeLists.txt | 12 +++++++++--- .../device/cellularcontext/CMakeLists.txt | 17 ++++++++--------- .../device/cellulardevice/CMakeLists.txt | 11 ++++++++--- .../device/cellularstatemachine/CMakeLists.txt | 12 +++++++++--- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt index 1d801efa87..66960f37cc 100644 --- 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 ) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt index 56e3e80aa0..6d63421886 100644 --- 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 ) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt index 272e30a1cc..65ae0e2d85 100644 --- 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 ) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt index 24cdefd4d2..10d3dbdc7d 100644 --- 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 )