CMake: Update netsocket, lorawan unittest to use mbed-stubs-mbedtls

rajkan01 · rajkan01 · commit ef7699d8244a · 2021-07-12T07:18:41.000-07:00
Update netsocket and lorawan unit tests to link with a mbed-stubs-mbedtls
library that it depends on instead of link with mbed-stubs
which is a group of stubs libraries.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -33,8 +33,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
-        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls
-        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
 )
diff --git a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -46,5 +46,6 @@ target_link_libraries(mbed-stubs-lorawan
         mbed-headers-connectivity
         mbed-headers-platform
         mbed-headers-lorawan
+        mbed-headers-mbedtls
         gtest
 )
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
@@ -34,6 +34,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-lorawan
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
@@ -19,6 +19,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-lorawan
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
@@ -19,6 +19,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-lorawan
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
@@ -21,6 +21,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-headers-cellular
+        mbed-headers-mbedtls
         mbed-headers-lorawan
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
@@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-lorawan
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,6 +1,14 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-headers-mbedtls INTERFACE)
+
+target_include_directories(mbed-headers-mbedtls
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls
+        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include
+)
+
 add_library(mbed-stubs-mbedtls)
 
 target_sources(mbed-stubs-mbedtls
@@ -14,6 +22,7 @@ target_sources(mbed-stubs-mbedtls
 target_link_libraries(mbed-stubs-mbedtls
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-stubs-headers
         mbed-stubs-rtos
         gtest
diff --git 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-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git 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-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git 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-mbedtls
         mbed-headers-netsocket
         mbed-headers
         mbed-stubs
diff --git 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-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git 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-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git 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-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git 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-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,6 @@ target_include_directories(mbed-headers-connectivity`
`33`	`33`	`${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice`
`34`	`34`	`${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice`
`35`	`35`	`${mbed-os_SOURCE_DIR}/connectivity`
`36`		`- ${mbed-os_SOURCE_DIR}/connectivity/mbedtls`
`37`		`- ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include`
`38`	`36`	`${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include`
`39`	`37`	`${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble`
`40`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,5 +46,6 @@ target_link_libraries(mbed-stubs-lorawan`
`46`	`46`	`mbed-headers-connectivity`
`47`	`47`	`mbed-headers-platform`
`48`	`48`	`mbed-headers-lorawan`
	`49`	`+ mbed-headers-mbedtls`
`49`	`50`	`gtest`
`50`	`51`	`)`