Skip to content

Move mbed-stubs-drivers to the drivers directory #14786

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
Jun 24, 2021
Merged

Move mbed-stubs-drivers to the drivers directory #14786

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
ae5bc5a
CMake: Move drivers stubs to the mbed-os/drivers directory
rajkan01 Jun 16, 2021
05cd885
CMake: unit-tests: Move mbed-headers-drivers to the drivers directory
rajkan01 Jun 16, 2021
e64d1c7
CMake: unit-tests: Make drivers stub only depend on headers it uses
rajkan01 Jun 16, 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
9 changes: 0 additions & 9 deletions UNITTESTS/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ add_library(mbed-headers-base INTERFACE)
add_library(mbed-headers-platform INTERFACE)
add_library(mbed-headers-connectivity INTERFACE)
add_library(mbed-headers-storage INTERFACE)
add_library(mbed-headers-drivers INTERFACE)
add_library(mbed-headers-hal INTERFACE)
add_library(mbed-headers-events INTERFACE)
add_library(mbed-headers-rtos INTERFACE)
Expand Down Expand Up @@ -87,13 +86,6 @@ target_include_directories(mbed-headers-connectivity
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
)

target_include_directories(mbed-headers-drivers
INTERFACE
${mbed-os_SOURCE_DIR}/drivers
${mbed-os_SOURCE_DIR}/drivers/include
${mbed-os_SOURCE_DIR}/drivers/include/drivers
)

target_include_directories(mbed-headers-events
INTERFACE
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
Expand Down Expand Up @@ -128,7 +120,6 @@ target_include_directories(mbed-stubs-headers
)

add_subdirectory(connectivity)
add_subdirectory(drivers)
add_subdirectory(events)
add_subdirectory(hal)
add_subdirectory(platform)
Expand Down
2 changes: 1 addition & 1 deletion drivers/tests/UNITTESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(doubles)
add_subdirectory(PwmOut)
add_subdirectory(Watchdog)
0 ...STS/stubs/drivers/BufferedSerial_stub.cpp → ...UNITTESTS/doubles/BufferedSerial_stub.cpp
View file
Open in desktop
File renamed without changes.
15 changes: 13 additions & 2 deletions UNITTESTS/stubs/drivers/CMakeLists.txt → ...rs/tests/UNITTESTS/doubles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_library(mbed-headers-drivers INTERFACE)

target_include_directories(mbed-headers-drivers
INTERFACE
${mbed-os_SOURCE_DIR}/drivers
${mbed-os_SOURCE_DIR}/drivers/include
${mbed-os_SOURCE_DIR}/drivers/include/drivers
)

add_library(mbed-stubs-drivers)

target_sources(mbed-stubs-drivers
Expand All @@ -18,6 +27,8 @@ target_compile_definitions(mbed-stubs-drivers

target_link_libraries(mbed-stubs-drivers
PRIVATE
mbed-headers
mbed-stubs-headers
mbed-headers-base
mbed-headers-hal
mbed-headers-drivers
mbed-headers-platform
)
0 UNITTESTS/stubs/drivers/SerialBase_stub.cpp → ...sts/UNITTESTS/doubles/SerialBase_stub.cpp
View file
Open in desktop
File renamed without changes.