Skip to content

Commit 8902a0c

Browse files
0xc01700xc0170
authored
Merge pull request #14819 from ARMmbed/move_rtos_stubs
Move rtos stubs to the rtos directory
2 parents 043d173 + 8efb322 commit 8902a0c

File tree

22 files changed

+57
-30
lines changed

22 files changed

+57
-30
lines changed

‎UNITTESTS/stubs/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ add_library(mbed-headers-connectivity INTERFACE)
99
add_library(mbed-headers-storage INTERFACE)
1010
add_library(mbed-headers-hal INTERFACE)
1111
add_library(mbed-headers-events INTERFACE)
12-
add_library(mbed-headers-rtos INTERFACE)
1312

1413
target_link_libraries(mbed-headers
1514
INTERFACE
@@ -101,12 +100,6 @@ target_include_directories(mbed-headers-hal
101100
${mbed-os_SOURCE_DIR}/hal/include
102101
)
103102

104-
target_include_directories(mbed-headers-rtos
105-
INTERFACE
106-
${mbed-os_SOURCE_DIR}/rtos/include
107-
${mbed-os_SOURCE_DIR}/rtos/include/rtos
108-
)
109-
110103
target_include_directories(mbed-headers
111104
INTERFACE
112105
${mbed-os_SOURCE_DIR}/features
@@ -123,7 +116,6 @@ add_subdirectory(connectivity)
123116
add_subdirectory(events)
124117
add_subdirectory(hal)
125118
add_subdirectory(platform)
126-
add_subdirectory(rtos)
127119
add_subdirectory(storage)
128120

129121
add_library(mbed-stubs INTERFACE)

‎UNITTESTS/stubs/connectivity/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ target_sources(mbed-stubs-connectivity
5858

5959
target_link_libraries(mbed-stubs-connectivity
6060
PRIVATE
61+
mbed-stubs-rtos-headers
6162
mbed-headers
6263
mbed-stubs-headers
64+
mbed-stubs-rtos
6365
gtest
6466
)

‎UNITTESTS/stubs/rtos/CMakeLists.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ target_link_libraries(${TEST_NAME}
2626
mbed-headers
2727
mbed-stubs
2828
mbed-stubs-headers
29+
mbed-stubs-rtos-headers
2930
gmock_main
3031
)
3132

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ target_link_libraries(${TEST_NAME}
3232
mbed-headers
3333
mbed-stubs
3434
mbed-stubs-headers
35+
mbed-stubs-rtos
3536
gmock_main
3637
)
3738

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ target_link_libraries(${TEST_NAME}
3030
mbed-headers
3131
mbed-stubs
3232
mbed-stubs-headers
33+
mbed-stubs-rtos-headers
3334
gmock_main
3435
)
3536

‎connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME}
3131
mbed-headers
3232
mbed-stubs
3333
mbed-stubs-headers
34+
mbed-stubs-rtos-headers
3435
gmock_main
3536
)
3637

‎rtos/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
5+
add_subdirectory(tests/UNITTESTS)
6+
endif()
7+
48
target_include_directories(mbed-core
59
INTERFACE
610
.

‎rtos/tests/.mbedignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UNITTESTS/*

‎rtos/tests/UNITTESTS/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_subdirectory(doubles)

‎rtos/tests/UNITTESTS/doubles/CMakeLists.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_library(mbed-headers-rtos INTERFACE)
5+
6+
target_include_directories(mbed-headers-rtos
7+
INTERFACE
8+
${mbed-os_SOURCE_DIR}/rtos/include
9+
${mbed-os_SOURCE_DIR}/rtos/include/rtos
10+
)
11+
12+
add_library(mbed-stubs-rtos-headers INTERFACE)
13+
14+
target_include_directories(mbed-stubs-rtos-headers
15+
INTERFACE
16+
.
17+
)
18+
19+
add_library(mbed-stubs-rtos)
20+
21+
add_definitions(-DUNITTEST)
22+
23+
target_sources(mbed-stubs-rtos
24+
PRIVATE
25+
ConditionVariable_stub.cpp
26+
Kernel_stub.cpp
27+
mbed_rtos_rtx_stub.c
28+
Mutex_stub.cpp
29+
rtx_mutex_stub.c
30+
Semaphore_stub.cpp
31+
ThisThread_stub.cpp
32+
Thread_stub.cpp
33+
)
34+
35+
target_link_libraries(mbed-stubs-rtos
36+
PRIVATE
37+
mbed-headers-base
38+
mbed-headers-rtos
39+
mbed-headers-platform
40+
mbed-headers-drivers
41+
mbed-headers-hal
42+
)

‎UNITTESTS/stubs/rtos/ConditionVariable_stub.cpp renamed to ‎rtos/tests/UNITTESTS/doubles/ConditionVariable_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/ConditionVariable_stub.h renamed to ‎rtos/tests/UNITTESTS/doubles/ConditionVariable_stub.h

File renamed without changes.

‎UNITTESTS/stubs/rtos/Kernel_stub.cpp renamed to ‎rtos/tests/UNITTESTS/doubles/Kernel_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/rtos/Mutex_stub.cpp renamed to ‎rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/rtos/Semaphore_stub.cpp renamed to ‎rtos/tests/UNITTESTS/doubles/Semaphore_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/Semaphore_stub.h renamed to ‎rtos/tests/UNITTESTS/doubles/Semaphore_stub.h

File renamed without changes.

‎UNITTESTS/stubs/rtos/ThisThread_stub.cpp renamed to ‎rtos/tests/UNITTESTS/doubles/ThisThread_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/rtos/Thread_stub.cpp renamed to ‎rtos/tests/UNITTESTS/doubles/Thread_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/Thread_stub.h renamed to ‎rtos/tests/UNITTESTS/doubles/Thread_stub.h

File renamed without changes.

‎UNITTESTS/stubs/rtos/mbed_rtos_rtx_stub.c renamed to ‎rtos/tests/UNITTESTS/doubles/mbed_rtos_rtx_stub.c

File renamed without changes.

‎UNITTESTS/stubs/rtos/rtx_mutex_stub.c renamed to ‎rtos/tests/UNITTESTS/doubles/rtx_mutex_stub.c

File renamed without changes.

0 commit comments

Comments
 (0)