Skip to content

Commit fbdf2ff

Browse files
0xc01700xc0170
authored
Merge pull request #14951 from ARMmbed/refactor_rtos_greentea_cmake
CMake: Refactor rtos greentea cmake
2 parents 887bcf7 + 9a14430 commit fbdf2ff

File tree

16 files changed

+144
-122
lines changed

16 files changed

+144
-122
lines changed

‎rtos/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
55
if(BUILD_GREENTEA_TESTS)
6-
# add greentea test
6+
add_subdirectory(tests/TESTS)
77
else()
88
add_subdirectory(tests/UNITTESTS)
99
endif()

‎rtos/tests/TESTS/CMakeLists.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_subdirectory(mbed_rtos/basic)
5+
add_subdirectory(mbed_rtos/condition_variable)
6+
add_subdirectory(mbed_rtos/event_flags)
7+
add_subdirectory(mbed_rtos/heap_and_stack)
8+
add_subdirectory(mbed_rtos/kernel_tick_count)
9+
add_subdirectory(mbed_rtos/mail)
10+
add_subdirectory(mbed_rtos/malloc)
11+
add_subdirectory(mbed_rtos/MemoryPool)
12+
add_subdirectory(mbed_rtos/mutex)
13+
add_subdirectory(mbed_rtos/queue)
14+
add_subdirectory(mbed_rtos/semaphore)
15+
add_subdirectory(mbed_rtos/signals)
16+
add_subdirectory(mbed_rtos/systimer)
17+
add_subdirectory(mbed_rtos/threads)

‎rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
# Copyright (c) 2020 ARM Limited. All rights reserved.
1+
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
4+
include(mbed_greentea)
55

6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-memorypool)
8-
9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
6+
if(MBED_GREENTEA_TEST_BAREMETAL)
7+
set(TEST_SKIPPED "MemoryPool test cases require a RTOS to run.")
8+
endif()
129

1310
mbed_greentea_add_test(
1411
TEST_NAME
15-
${TEST_TARGET}
12+
mbed-rtos-memorypool
1613
TEST_SOURCES
1714
main.cpp
15+
TEST_SKIPPED
16+
${TEST_SKIPPED}
1817
)

‎rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
# Copyright (c) 2020 ARM Limited. All rights reserved.
1+
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
4+
include(mbed_greentea)
55

6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-basic)
6+
if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL)
7+
set(TEST_SKIPPED "RTOS basic test cases require RTOS with multithread to run")
8+
endif()
89

9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
10+
if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
11+
set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
12+
endif()
1213

1314
mbed_greentea_add_test(
1415
TEST_NAME
15-
${TEST_TARGET}
16+
mbed-rtos-basic
1617
TEST_SOURCES
1718
main.cpp
19+
HOST_TESTS_DIR
20+
"${CMAKE_CURRENT_LIST_DIR}/../../host_tests"
21+
TEST_SKIPPED
22+
${TEST_SKIPPED}
1823
)

‎rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt

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

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
4+
include(mbed_greentea)
55

6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-condition-variable)
6+
if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL)
7+
set(TEST_SKIPPED "Condition variable test cases require RTOS with multithread to run")
8+
endif()
89

9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
10+
if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
11+
set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
12+
endif()
1213

1314
mbed_greentea_add_test(
1415
TEST_NAME
15-
${TEST_TARGET}
16+
mbed-rtos-condition-variable
1617
TEST_SOURCES
1718
main.cpp
19+
TEST_SKIPPED
20+
${TEST_SKIPPED}
1821
)

‎rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
# Copyright (c) 2020 ARM Limited. All rights reserved.
1+
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
4+
include(mbed_greentea)
55

6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-event-flags)
8-
9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
6+
if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
7+
set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
8+
endif()
129

1310
mbed_greentea_add_test(
1411
TEST_NAME
15-
${TEST_TARGET}
12+
mbed-rtos-event-flags
1613
TEST_SOURCES
1714
main.cpp
15+
TEST_SKIPPED
16+
${TEST_SKIPPED}
1817
)

‎rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt

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

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
4+
include(mbed_greentea)
55

6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-heap-and-stack)
6+
if("TARGET_CORTEX_A" IN_LIST MBED_TARGET_DEFINITIONS)
7+
set(TEST_SKIPPED "test not supported for cortex-A.")
8+
elseif(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
9+
set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
10+
endif()
811

9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
1212

1313
mbed_greentea_add_test(
1414
TEST_NAME
15-
${TEST_TARGET}
15+
mbed-rtos-heap-and-stack
1616
TEST_SOURCES
1717
main.cpp
18+
TEST_SKIPPED
19+
${TEST_SKIPPED}
1820
)

‎rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt

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

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
5-
6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-kernel-tick-count)
8-
9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
4+
include(mbed_greentea)
125

136
mbed_greentea_add_test(
147
TEST_NAME
15-
${TEST_TARGET}
8+
mbed-rtos-kernel-tick-count
169
TEST_SOURCES
1710
main.cpp
1811
)

‎rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt

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

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
4+
include(mbed_greentea)
55

6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-mail)
6+
if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL)
7+
set(TEST_SKIPPED "mail test cases require RTOS with multithread to run")
8+
endif()
89

9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
10+
if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
11+
set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
12+
endif()
1213

1314
mbed_greentea_add_test(
1415
TEST_NAME
15-
${TEST_TARGET}
16+
mbed-rtos-mail
1617
TEST_SOURCES
1718
main.cpp
19+
TEST_SKIPPED
20+
${TEST_SKIPPED}
1821
)

‎rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
# Copyright (c) 2020 ARM Limited. All rights reserved.
1+
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
4+
include(mbed_greentea)
55

6-
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
7-
set(TEST_TARGET mbed-rtos-malloc)
8-
9-
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
10-
11-
project(${TEST_TARGET})
6+
if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
7+
set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
8+
endif()
129

1310
mbed_greentea_add_test(
1411
TEST_NAME
15-
${TEST_TARGET}
12+
mbed-rtos-malloc
1613
TEST_SOURCES
1714
main.cpp
15+
TEST_SKIPPED
16+
${TEST_SKIPPED}
1817
)

0 commit comments

Comments
 (0)