From ee67310922847addfd20c29e6d517204fd1d91e3 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Fri, 25 Jun 2021 07:05:27 -0700 Subject: [PATCH] CMake: unit-tests: Add mbed-headers-cellular headers library - Previously all cellular header made as a part of the mbed-headers-connectivity library. To make it easier to separate all the cellular headers into the separate mbed-headers-cellular library and keep them as part of cellular stub CMake. This makes the cellular stubs more self-contained and improves the composition of the library. - Update all unit test that depends on cellular headers with mbed-headers-cellular library --- UNITTESTS/stubs/CMakeLists.txt | 5 ----- .../cellular/tests/UNITTESTS/doubles/CMakeLists.txt | 12 ++++++++++++ .../framework/AT/at_cellularcontext/CMakeLists.txt | 1 + .../framework/AT/at_cellulardevice/CMakeLists.txt | 1 + .../AT/at_cellularinformation/CMakeLists.txt | 1 + .../framework/AT/at_cellularnetwork/CMakeLists.txt | 1 + .../framework/AT/at_cellularsms/CMakeLists.txt | 1 + .../framework/AT/at_cellularstack/CMakeLists.txt | 1 + .../UNITTESTS/framework/common/list/CMakeLists.txt | 1 + .../UNITTESTS/framework/common/util/CMakeLists.txt | 1 + .../framework/device/athandler/CMakeLists.txt | 1 + .../framework/device/cellularcontext/CMakeLists.txt | 1 + .../framework/device/cellulardevice/CMakeLists.txt | 1 + .../device/cellularstatemachine/CMakeLists.txt | 1 + .../features/lorawan/loraphyeu433/CMakeLists.txt | 1 + .../features/lorawan/loraphykr920/CMakeLists.txt | 1 + .../features/lorawan/loraphyus915/CMakeLists.txt | 1 + .../features/lorawan/lorawaninterface/CMakeLists.txt | 1 + .../netsocket/CellularNonIPSocket/CMakeLists.txt | 1 + 19 files changed, 29 insertions(+), 5 deletions(-) diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt index 50cfb307ad..76067282be 100644 --- a/UNITTESTS/stubs/CMakeLists.txt +++ b/UNITTESTS/stubs/CMakeLists.txt @@ -67,11 +67,6 @@ target_include_directories(mbed-headers-connectivity ${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/cellular/include/cellular/framework/API - ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT - ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device - ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework - ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common ${mbed-os_SOURCE_DIR}/connectivity ${mbed-os_SOURCE_DIR}/connectivity/lorawan/include/lorawan ${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt index a219d26ca0..2cb1cc366c 100644 --- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt @@ -1,6 +1,17 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-headers-cellular INTERFACE) + +target_include_directories(mbed-headers-cellular + INTERFACE + ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/API + ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT + ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device + ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework + ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common +) + add_library(mbed-stubs-cellular) target_compile_definitions(mbed-stubs-cellular @@ -34,6 +45,7 @@ target_sources(mbed-stubs-cellular target_link_libraries(mbed-stubs-cellular PRIVATE mbed-headers + mbed-headers-cellular 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 a39933bdfe..b56698292a 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-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 4e9db7879a..228f89da27 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers 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 c75fb803a9..b497c81a24 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers 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 8c00587a31..cec6b8f905 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers 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 7a19d17f0c..f8f34eb4f9 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers 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 a300cb2876..a2c2fb8c5c 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt index fea658b740..59ee4cb238 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt @@ -13,6 +13,7 @@ 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 5731fb5aff..cd77650fde 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-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 b75ac977b0..428cac1a01 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt index 0e2cc73d68..ddd9181d0b 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt index d01158d6f9..54c9dc7616 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt index 11bfb940ca..a5c1b55e4b 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt index 913dae3979..9c92c97561 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt @@ -21,6 +21,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-cellular mbed-stubs mbed-stubs-headers gmock_main diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt index be56ff856f..30d14dba63 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt @@ -21,6 +21,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-cellular mbed-stubs mbed-stubs-headers gmock_main diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt index 3e94d6ee1b..dabe160fe7 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt @@ -27,6 +27,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-cellular mbed-stubs mbed-stubs-headers gmock_main diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt index 489cece0c1..85ae18afd8 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt @@ -20,6 +20,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-cellular mbed-stubs mbed-stubs-headers gmock_main diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt index bd65504c8c..2acaddb6bc 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-cellular mbed-stubs mbed-stubs-cellular mbed-stubs-headers