diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt index aeadeef118b..ce1e5ec52ca 100644 --- 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 index 895212b08e9..df8dbd5bf3a 100644 --- 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 index e011ad27dd5..68a16b1156b 100644 --- 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 index c9250fbf466..ab15847a01a 100644 --- 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 index 78c6d44ef7d..d03b9428704 100644 --- 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 index bfda0d1f4e8..f08c087905a 100644 --- 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 index edca76f292f..b3b409405ae 100644 --- 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 index b92d3936322..adc5b11e755 100644 --- 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 index b8838096468..65598499a45 100644 --- 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 index 51938fe78da..f000967e336 100644 --- 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 new file mode 100644 index 00000000000..72e8ffc0db8 --- /dev/null +++ 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 new file mode 100644 index 00000000000..fa602edaab1 --- /dev/null +++ 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 new file mode 100644 index 00000000000..c677a704a85 --- /dev/null +++ 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/UNITTESTS/stubs/connectivity/aes_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c similarity index 100% rename from UNITTESTS/stubs/connectivity/aes_stub.c rename to connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c diff --git a/UNITTESTS/stubs/aes_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h similarity index 100% rename from UNITTESTS/stubs/aes_stub.h rename to connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h diff --git a/UNITTESTS/stubs/connectivity/cipher_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c similarity index 100% rename from UNITTESTS/stubs/connectivity/cipher_stub.c rename to connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c diff --git a/UNITTESTS/stubs/cipher_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h similarity index 100% rename from UNITTESTS/stubs/cipher_stub.h rename to connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h diff --git a/UNITTESTS/stubs/connectivity/cmac_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c similarity index 100% rename from UNITTESTS/stubs/connectivity/cmac_stub.c rename to connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c diff --git a/UNITTESTS/stubs/cmac_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.h similarity index 100% rename from UNITTESTS/stubs/cmac_stub.h rename to 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 index 9564055efa9..7a8a4c1f79d 100644 --- 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 index bfc358b8097..27de0ddbfdb 100644 --- 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 index 6f6478b5b2c..c0c34e3ff4a 100644 --- 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 index cfaf6ae55ff..5056cc0fbaa 100644 --- 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 index ebb0ee452f4..d2b8b7dcfe5 100644 --- 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 index 8d1fc333298..e10cd249434 100644 --- 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 index 56248a39b7a..43472c5f207 100644 --- 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 )