Skip to content

Move connectivity mbedtls stubs #14890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 13, 2021
Merged

Move connectivity mbedtls stubs #14890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66019cb
CMake: Move mbedtls stubs to the mbedtls dir
rajkan01 Jul 7, 2021
ef7699d
CMake: Update netsocket, lorawan unittest to use mbed-stubs-mbedtls
rajkan01 Jul 7, 2021
d57ed8d
CMake: Move mbedtls stub headers to the mbedtls doubles dir
rajkan01 Jul 7, 2021
f500226
CMake: Limit the mbed-stubs-mbedtls to required dependency mocks
rajkan01 Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions UNITTESTS/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions UNITTESTS/stubs/connectivity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions connectivity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ else()
add_subdirectory(cellular)
add_subdirectory(lorawan)
add_subdirectory(netsocket)
add_subdirectory(mbedtls)
endif()
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,6 @@ target_link_libraries(mbed-stubs-lorawan
mbed-headers-connectivity
mbed-headers-platform
mbed-headers-lorawan
mbed-headers-mbedtls
gtest
)
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions connectivity/mbedtls/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
.
Expand Down
1 change: 1 addition & 0 deletions connectivity/mbedtls/tests/UNITTESTS/.mbedignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*
3 changes: 3 additions & 0 deletions connectivity/mbedtls/tests/UNITTESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_subdirectory(doubles)
33 changes: 33 additions & 0 deletions connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
0 UNITTESTS/stubs/connectivity/aes_stub.c → ...bedtls/tests/UNITTESTS/doubles/aes_stub.c
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/aes_stub.h → ...bedtls/tests/UNITTESTS/doubles/aes_stub.h
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/connectivity/cipher_stub.c → ...tls/tests/UNITTESTS/doubles/cipher_stub.c
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/cipher_stub.h → ...tls/tests/UNITTESTS/doubles/cipher_stub.h
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/connectivity/cmac_stub.c → ...edtls/tests/UNITTESTS/doubles/cmac_stub.c
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/cmac_stub.h → ...edtls/tests/UNITTESTS/doubles/cmac_stub.h
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ target_sources(${TEST_NAME}

target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-headers
mbed-stubs
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down