Skip to content

Move connectivity lora stubs #14842

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

Move connectivity lora stubs #14842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f238f1
CMake: Move lorawan stubs to the lorawan dir
rajkan01 Jun 28, 2021
fee7906
CMake: Update lorawan unittest to use mbed-stubs-lorawan
rajkan01 Jun 28, 2021
8c58048
CMake: unit-tests: Add mbed-headers-lorawan headers library
rajkan01 Jun 28, 2021
8d7d173
CMake: Update lorawan unittest to use mbed-headers-lorawan lib
rajkan01 Jun 28, 2021
728e183
CMake: unit-tests: Make lorawan stub only depend on headers it uses
rajkan01 Jun 28, 2021
46d4247
CMake: Move lorawan stub headers to the lorawan/tests/UNITTESTS/doubl…
rajkan01 Jun 29, 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
6 changes: 0 additions & 6 deletions UNITTESTS/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ target_include_directories(mbed-headers-connectivity
${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/lorawan/include/lorawan
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack/mac
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack/phy
${mbed-os_SOURCE_DIR}/connectivity/lorawan
${mbed-os_SOURCE_DIR}/connectivity/lorawan/system
${mbed-os_SOURCE_DIR}/connectivity/mbedtls
${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
Expand Down
8 changes: 0 additions & 8 deletions UNITTESTS/stubs/connectivity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ target_sources(mbed-stubs-connectivity
cipher_stub.c
cmac_stub.c
ip4tos_stub.c
LoRaMacChannelPlan_stub.cpp
LoRaMacCommand_stub.cpp
LoRaMacCrypto_stub.cpp
LoRaMac_stub.cpp
LoRaPHYEU868_stub.cpp
LoRaPHY_stub.cpp
LoRaWANStack_stub.cpp
LoRaWANTimer_stub.cpp
MeshInterface_stub.cpp
NetworkInterfaceDefaults_stub.cpp
NetworkInterface_stub.cpp
Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

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

add_library(mbed-headers-lorawan INTERFACE)

target_include_directories(mbed-headers-lorawan
INTERFACE
${mbed-os_SOURCE_DIR}/connectivity/lorawan/include/lorawan
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack/mac
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack/phy
${mbed-os_SOURCE_DIR}/connectivity/lorawan
${mbed-os_SOURCE_DIR}/connectivity/lorawan/system
)

add_library(mbed-stubs-lorawan)

target_compile_definitions(mbed-stubs-lorawan
PRIVATE
MBED_CONF_LORA_TX_MAX_SIZE=255
)

target_include_directories(mbed-stubs-lorawan
PUBLIC
.
)

target_sources(mbed-stubs-lorawan
PRIVATE
LoRaMacChannelPlan_stub.cpp
LoRaMacCommand_stub.cpp
LoRaMacCrypto_stub.cpp
LoRaMac_stub.cpp
LoRaPHYEU868_stub.cpp
LoRaPHY_stub.cpp
LoRaWANStack_stub.cpp
LoRaWANTimer_stub.cpp
)

target_link_libraries(mbed-stubs-lorawan
PRIVATE
mbed-headers-base
mbed-headers-events
mbed-headers-hal
mbed-stubs-headers
mbed-headers-connectivity
mbed-headers-platform
mbed-headers-lorawan
gtest
)
0 .../connectivity/LoRaMacChannelPlan_stub.cpp → ...TESTS/doubles/LoRaMacChannelPlan_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...tubs/connectivity/LoRaMacCommand_stub.cpp → ...UNITTESTS/doubles/LoRaMacCommand_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/LoRaMacCommand_stub.h → ...s/UNITTESTS/doubles/LoRaMacCommand_stub.h
View file
Open in desktop
File renamed without changes.
0 ...stubs/connectivity/LoRaMacCrypto_stub.cpp → .../UNITTESTS/doubles/LoRaMacCrypto_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/LoRaMacCrypto_stub.h → ...ts/UNITTESTS/doubles/LoRaMacCrypto_stub.h
View file
Open in desktop
File renamed without changes.
0 ...TESTS/stubs/connectivity/LoRaMac_stub.cpp → .../tests/UNITTESTS/doubles/LoRaMac_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/LoRaMac_stub.h → ...an/tests/UNITTESTS/doubles/LoRaMac_stub.h
View file
Open in desktop
File renamed without changes.
0 .../stubs/connectivity/LoRaPHYEU868_stub.cpp → ...s/UNITTESTS/doubles/LoRaPHYEU868_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...TESTS/stubs/connectivity/LoRaPHY_stub.cpp → .../tests/UNITTESTS/doubles/LoRaPHY_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/LoRaPHY_stub.h → ...an/tests/UNITTESTS/doubles/LoRaPHY_stub.h
View file
Open in desktop
File renamed without changes.
0 .../stubs/connectivity/LoRaWANStack_stub.cpp → ...s/UNITTESTS/doubles/LoRaWANStack_stub.cpp
View file
Open in desktop
File renamed without changes.
0 .../stubs/connectivity/LoRaWANTimer_stub.cpp → ...s/UNITTESTS/doubles/LoRaWANTimer_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/LoRaWANTimer_stub.h → ...sts/UNITTESTS/doubles/LoRaWANTimer_stub.h
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 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,8 +34,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 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,8 +19,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
1 change: 1 addition & 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,6 +19,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 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,8 +21,10 @@ target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
2 changes: 2 additions & 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,8 +21,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
mbed-stubs-lorawan
gmock_main
)

Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-lorawan
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down