Merge pull request #14890 from ARMmbed/move_connectivity_mbedtls_stubs

Move connectivity mbedtls stubs
2021-07-13 14:21:25 +02:00 · 2021-07-13 14:21:25 +02:00 · 46b411d5b2
parent 0ea3f0cc53 f5002269c0
commit 46b411d5b2
26 changed files with 60 additions and 7 deletions
--- 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)
--- 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
--- 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()
--- 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
 )
--- 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
--- 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
--- 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
 )

--- 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
--- 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
--- 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
        .
--- a/connectivity/mbedtls/tests/UNITTESTS/.mbedignore
+++ b/connectivity/mbedtls/tests/UNITTESTS/.mbedignore
@ -0,0 +1 @@
+*
--- 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)
--- 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
+)
--- a/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c
--- a/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h
--- a/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c
--- a/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h
--- a/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c
--- a/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.h
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.h
--- 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
 )
--- 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
 )
--- 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
--- 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
--- 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
--- 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
 )
--- 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
 )