Merge pull request #14873 from ARMmbed/move_connectivity_netsocket_stubs

Move connectivity netsocket stubs
pull/14870/head
Martin Kojtal 2021-07-07 17:45:47 +02:00 committed by GitHub
commit feb48fca2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 89 additions and 12 deletions

View File

@ -33,7 +33,6 @@ 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/netsocket/include
${mbed-os_SOURCE_DIR}/connectivity
${mbed-os_SOURCE_DIR}/connectivity/mbedtls
${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include

View File

@ -19,17 +19,9 @@ target_compile_definitions(mbed-stubs-connectivity
target_sources(mbed-stubs-connectivity
PRIVATE
aes_stub.c
CellularInterface_stub.cpp
cipher_stub.c
cmac_stub.c
ip4tos_stub.c
MeshInterface_stub.cpp
NetworkInterfaceDefaults_stub.cpp
NetworkInterface_stub.cpp
NetworkStack_stub.cpp
nsapi_dns_stub.cpp
SocketAddress_stub.cpp
SocketStats_Stub.cpp
stoip4_stub.c
${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
)

View File

@ -56,7 +56,9 @@ target_link_libraries(mbed-stubs-cellular
mbed-headers-drivers
mbed-headers-hal
mbed-headers-events
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs-netsocket
mbed-stubs-headers
gtest
)

View File

@ -24,9 +24,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-headers-filesystem
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos-headers

View File

@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos

View File

@ -22,8 +22,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
gmock_main

View File

@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
gmock_main

View File

@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
gmock_main

View File

@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular

View File

@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs-platform
gmock_main

View File

@ -25,6 +25,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular

View File

@ -36,9 +36,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-netsocket
mbed-stubs-headers
gmock_main
)

View File

@ -27,6 +27,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers-netsocket
mbed-headers
mbed-headers-cellular
mbed-stubs

View File

@ -29,6 +29,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular

View File

@ -1,4 +1,5 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_subdirectory(doubles)
add_subdirectory(netsocket)

View File

@ -0,0 +1,38 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-headers-netsocket INTERFACE)
target_include_directories(mbed-headers-netsocket
INTERFACE
${mbed-os_SOURCE_DIR}/connectivity/netsocket/include
)
add_library(mbed-stubs-netsocket)
target_include_directories(mbed-stubs-netsocket
PUBLIC
.
)
target_sources(mbed-stubs-netsocket
PRIVATE
CellularInterface_stub.cpp
MeshInterface_stub.cpp
NetworkInterfaceDefaults_stub.cpp
NetworkInterface_stub.cpp
NetworkStack_stub.cpp
nsapi_dns_stub.cpp
SocketAddress_stub.cpp
SocketStats_Stub.cpp
)
target_link_libraries(mbed-stubs-netsocket
PRIVATE
mbed-headers-netsocket
mbed-stubs-rtos-headers
mbed-headers
mbed-stubs-headers
mbed-stubs-rtos
gtest
)

View File

@ -23,9 +23,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-netsocket
mbed-stubs-headers
gmock_main
)

View File

@ -31,8 +31,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -28,9 +28,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers-netsocket
mbed-headers
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -43,8 +43,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -26,8 +26,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -25,8 +25,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -19,6 +19,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
gmock_main

View File

@ -27,8 +27,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

View File

@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
gmock_main