Skip to content

Move events stubs to events dir #14823

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 12, 2021
Merged

Move events stubs to events dir #14823

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
88410a5
CMake: Move events stubs sources to the mbed-os/events directory
rajkan01 Jun 23, 2021
65d202b
CMake: unit-tests: Move mbed-headers-events to the events directory
rajkan01 Jun 23, 2021
447754f
CMake: Move events stub headers to the events/tests/UNITTESTS/double dir
rajkan01 Jun 23, 2021
652b421
CMake: unit-tests: Make events stub only depend on headers it uses
rajkan01 Jun 23, 2021
99e16c2
Remove trailing space
rajkan01 Jul 8, 2021
863ef79
CMake: Move events fakes into events double dir
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
1 change: 0 additions & 1 deletion UNITTESTS/fakes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(events)
add_subdirectory(ble)
11 changes: 0 additions & 11 deletions UNITTESTS/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ add_library(mbed-stubs-headers INTERFACE)
add_library(mbed-headers INTERFACE)
add_library(mbed-headers-base INTERFACE)
add_library(mbed-headers-connectivity INTERFACE)
add_library(mbed-headers-events INTERFACE)

target_link_libraries(mbed-headers
INTERFACE
Expand Down Expand Up @@ -40,15 +39,6 @@ target_include_directories(mbed-headers-connectivity
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
)

target_include_directories(mbed-headers-events
INTERFACE
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h/equeue
${mbed-os_SOURCE_DIR}/events/include
${mbed-os_SOURCE_DIR}/events/include/events
${mbed-os_SOURCE_DIR}/events/include/events/internal
)

target_include_directories(mbed-headers
INTERFACE
${mbed-os_SOURCE_DIR}/features
Expand All @@ -62,7 +52,6 @@ target_include_directories(mbed-stubs-headers
)

add_subdirectory(connectivity)
add_subdirectory(events)

add_library(mbed-stubs INTERFACE)

Expand Down
19 changes: 0 additions & 19 deletions UNITTESTS/stubs/events/CMakeLists.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions events/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(equeue)
41 changes: 41 additions & 0 deletions events/tests/UNITTESTS/doubles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(fakes)

add_library(mbed-headers-events INTERFACE)

target_include_directories(mbed-headers-events
INTERFACE
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h/equeue
${mbed-os_SOURCE_DIR}/events/include
${mbed-os_SOURCE_DIR}/events/include/events
${mbed-os_SOURCE_DIR}/events/include/events/internal
)

add_library(mbed-stubs-events)

target_sources(mbed-stubs-events
PRIVATE
equeue_stub.c
EqueuePosix_stub.c
EventFlags_stub.cpp
EventQueue_stub.cpp
mbed_shared_queues_stub.cpp
)

target_include_directories(mbed-stubs-events
PUBLIC
.
)

target_link_libraries(mbed-stubs-events
PRIVATE
mbed-headers-base
mbed-headers-drivers
mbed-headers-hal
mbed-headers-events
mbed-headers-rtos
mbed-headers-platform
)
0 .../tests/UNITTESTS/stubs/EqueuePosix_stub.c → ...ests/UNITTESTS/doubles/EqueuePosix_stub.c
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/events/EventFlags_stub.cpp → ...sts/UNITTESTS/doubles/EventFlags_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/events/EventQueue_stub.cpp → ...sts/UNITTESTS/doubles/EventQueue_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/EventQueue_stub.h → ...tests/UNITTESTS/doubles/EventQueue_stub.h
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/events/equeue_stub.c → events/tests/UNITTESTS/doubles/equeue_stub.c
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/equeue_stub.h → events/tests/UNITTESTS/doubles/equeue_stub.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion UNITTESTS/fakes/events/CMakeLists.txt → ...ts/UNITTESTS/doubles/fakes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ target_sources(mbed-fakes-event-queue

target_include_directories(mbed-fakes-event-queue
PUBLIC
.
.
)

target_link_libraries(mbed-fakes-event-queue
Expand Down
0 UNITTESTS/fakes/events/events/EventQueue.cpp → ...TESTS/doubles/fakes/events/EventQueue.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/fakes/events/events/EventQueue.h → ...ITTESTS/doubles/fakes/events/EventQueue.h
View file
Open in desktop
File renamed without changes.
0 .../stubs/events/mbed_shared_queues_stub.cpp → ...TESTS/doubles/mbed_shared_queues_stub.cpp
View file
Open in desktop
File renamed without changes.