Merge pull request #14890 from ARMmbed/move_connectivity_mbedtls_stubs

0xc0170 · web-flow · commit 46b411d5b27b · 2021-07-13T14:21:25.000+02:00
Move connectivity mbedtls stubs
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
 )
@@ -48,7 +46,6 @@ target_include_directories(mbed-headers
 target_include_directories(mbed-stubs-headers
     INTERFACE
         .
-        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub
 )
 
 add_subdirectory(connectivity)
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@@ -18,12 +18,8 @@ target_compile_definitions(mbed-stubs-connectivity
 
 target_sources(mbed-stubs-connectivity
     PRIVATE
-        aes_stub.c
-        cipher_stub.c
-        cmac_stub.c
         ip4tos_stub.c
         stoip4_stub.c
-        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
 )
 
 target_link_libraries(mbed-stubs-connectivity
diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
@@ -41,4 +41,5 @@ else()
     add_subdirectory(cellular)
     add_subdirectory(lorawan)
     add_subdirectory(netsocket)
+    add_subdirectory(mbedtls)
 endif()
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,9 +19,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-lorawan
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         gmock_main
 )
 
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/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS)
+endif()
+
 target_include_directories(mbed-mbedtls
     INTERFACE
         .
diff --git a/connectivity/mbedtls/tests/UNITTESTS/.mbedignore b/connectivity/mbedtls/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/connectivity/mbedtls/tests/UNITTESTS/CMakeLists.txt b/connectivity/mbedtls/tests/UNITTESTS/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+add_subdirectory(doubles)
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,33 @@
+# 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_include_directories(mbed-stubs-mbedtls
+    PUBLIC
+        .
+        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub
+)
+
+target_sources(mbed-stubs-mbedtls
+    PRIVATE
+        aes_stub.c
+        cipher_stub.c
+        cmac_stub.c
+        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+)
+
+target_link_libraries(mbed-stubs-mbedtls
+    PRIVATE
+        mbed-headers-mbedtls
+        mbed-stubs-rtos
+        gtest
+)
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.h
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
@@ -31,9 +31,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
@@ -30,9 +30,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )
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,9 +29,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
@@ -28,9 +28,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )

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`	`)`
`@@ -48,7 +46,6 @@ target_include_directories(mbed-headers`
`48`	`46`	`target_include_directories(mbed-stubs-headers`
`49`	`47`	`INTERFACE`
`50`	`48`	`.`
`51`		`- ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub`
`52`	`49`	`)`
`53`	`50`
`54`	`51`	`add_subdirectory(connectivity)`
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`	`)`