Skip to content

Move connectivity nanostack libservice stub #14896

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 3 commits into from
Jul 13, 2021
Merged

Move connectivity nanostack libservice stub #14896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d95bf96
CMake: Move nanostack libservice stubs to the connectivity/libraries dir
rajkan01 Jul 8, 2021
22b2e9f
CMake: Add mbed-headers-nanostack-libservice library
rajkan01 Jul 8, 2021
d488597
CMake: Limit the mbed-stubs-nanostack-libservice to required dependen…
rajkan01 Jul 8, 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
5 changes: 0 additions & 5 deletions UNITTESTS/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ target_include_directories(mbed-headers-base

target_include_directories(mbed-headers-connectivity
INTERFACE
${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/FEATURE_BLE/include
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
Expand All @@ -48,13 +46,10 @@ target_include_directories(mbed-stubs-headers
.
)

add_subdirectory(connectivity)

add_library(mbed-stubs INTERFACE)

target_link_libraries(mbed-stubs
INTERFACE
mbed-stubs-connectivity
mbed-stubs-drivers
mbed-stubs-events
mbed-stubs-hal
Expand Down
32 changes: 0 additions & 32 deletions UNITTESTS/stubs/connectivity/CMakeLists.txt
View file
Open in desktop

This file was deleted.

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 @@ -42,4 +42,5 @@ else()
add_subdirectory(lorawan)
add_subdirectory(netsocket)
add_subdirectory(mbedtls)
add_subdirectory(libraries)
endif()
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/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
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
Expand Down
4 changes: 4 additions & 0 deletions connectivity/libraries/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()

add_subdirectory(mbed-coap)
add_subdirectory(nanostack-libservice)
add_subdirectory(ppp)
1 change: 1 addition & 0 deletions connectivity/libraries/tests/UNITTESTS/.mbedignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*
4 changes: 4 additions & 0 deletions connectivity/libraries/tests/UNITTESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(doubles)
23 changes: 23 additions & 0 deletions connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_library(mbed-headers-nanostack-libservice INTERFACE)

target_include_directories(mbed-headers-nanostack-libservice
INTERFACE
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
)
add_library(mbed-stubs-nanostack-libservice)

target_sources(mbed-stubs-nanostack-libservice
PRIVATE
ip4tos_stub.c
stoip4_stub.c
)

target_link_libraries(mbed-stubs-nanostack-libservice
PRIVATE
mbed-headers-nanostack-libservice
gtest
)
0 UNITTESTS/stubs/connectivity/ip4tos_stub.c → ...ies/tests/UNITTESTS/doubles/ip4tos_stub.c
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/connectivity/stoip4_stub.c → ...ies/tests/UNITTESTS/doubles/stoip4_stub.c
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 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,6 +31,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-stubs
Expand Down
1 change: 1 addition & 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,6 +30,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-stubs
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-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-headers
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-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-stubs
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/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-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
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-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-stubs
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/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-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
Expand Down
1 change: 1 addition & 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,6 +29,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-stubs
Expand Down
1 change: 1 addition & 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,6 +28,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-stubs
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/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
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
Expand Down