From 174e01667fd98a20a339e5b8c5bfe17b2d76db78 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 22 Jul 2021 07:29:00 -0700 Subject: [PATCH 1/4] CMake: Refactor rtos greentea test CMake Initially, every library greentea test has its project() creation in their CMake. As running greentea using CTest move all greentea test suite under one global project mbed-os and MBED_CONFIG_PATH set at the root mbed os CMake under the condition BUILD_GREENTEA_TESTS check so refactored rtos greentea CMake accordingly. --- .../TESTS/mbed_rtos/MemoryPool/CMakeLists.txt | 13 +++---------- rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt | 15 +++++---------- .../mbed_rtos/condition_variable/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_rtos/event_flags/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt | 13 +++---------- .../mbed_rtos/kernel_tick_count/CMakeLists.txt | 13 +++---------- rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt | 13 +++---------- rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt | 13 +++---------- rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt | 13 +++---------- rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_rtos/semaphore/CMakeLists.txt | 13 +++---------- rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt | 13 +++---------- .../tests/TESTS/mbed_rtos/systimer/CMakeLists.txt | 13 +++---------- rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt | 15 +++++---------- 14 files changed, 46 insertions(+), 140 deletions(-) diff --git a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt index 9794b7c8cb..30bef73c20 100644 --- a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-memorypool) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-memorypool TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt index 3c9b8cb398..496ef6fcce 100644 --- a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt @@ -1,18 +1,13 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-basic) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-basic TEST_SOURCES main.cpp + HOST_TESTS_DIR + "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" ) diff --git a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt index 57e3ef1055..33028d76ac 100644 --- a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-condition-variable) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-condition-variable TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt index 94460f1f94..5961bb84ea 100644 --- a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-event-flags) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-event-flags TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt index dd93b95239..de7dee1a0f 100644 --- a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-heap-and-stack) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-heap-and-stack TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt index c95ca86fc2..5ffd93f0ba 100644 --- a/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-kernel-tick-count) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-kernel-tick-count TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt index 26feb9f873..d548420121 100644 --- a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-mail) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-mail TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt index 78b0310b2c..b82b329d6b 100644 --- a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-malloc) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-malloc TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt index 8734d6c3f9..5903f82e64 100644 --- a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-mutex) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-mutex TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt index 9c908197cd..41cd627f00 100644 --- a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-queue) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-queue TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt index d718b92904..515f402654 100644 --- a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-semaphore) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-semaphore TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt index cca7ed5479..7c95f433fd 100644 --- a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-signals) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-signals TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt index 0606dfb741..0c2d56c946 100644 --- a/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt @@ -1,18 +1,11 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-systimer) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-systimer TEST_SOURCES main.cpp ) diff --git a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt index 8499ab3437..bdf12b8d10 100644 --- a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt @@ -1,18 +1,13 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-rtos-threads) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-rtos-threads + TEST_INCLUDE_DIRS + . TEST_SOURCES main.cpp ) From 5d31b71f81e6f598ec47146c47b559aaa8172f1b Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 23 Aug 2021 13:47:14 +0100 Subject: [PATCH 2/4] CMake: greentea: Add skip reason to rtos test --- rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt | 6 ++++++ rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt | 10 ++++++++++ .../TESTS/mbed_rtos/condition_variable/CMakeLists.txt | 10 ++++++++++ rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt | 6 ++++++ .../TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt | 9 +++++++++ rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt | 10 ++++++++++ rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt | 6 ++++++ rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt | 10 ++++++++++ rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt | 10 ++++++++++ rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt | 6 ++++++ rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt | 6 ++++++ rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt | 10 ++++++++++ 12 files changed, 99 insertions(+) diff --git a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt index 30bef73c20..3a163d578f 100644 --- a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "MemoryPool test cases require a RTOS to run.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-memorypool TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt index 496ef6fcce..c2bbccd2d0 100644 --- a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt @@ -3,6 +3,14 @@ include(mbed_greentea) +if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "RTOS basic test cases require RTOS with multithread to run") +endif() + +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-basic @@ -10,4 +18,6 @@ mbed_greentea_add_test( main.cpp HOST_TESTS_DIR "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt index 33028d76ac..88b79ebdd7 100644 --- a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt @@ -3,9 +3,19 @@ include(mbed_greentea) +if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "Condition variable test cases require RTOS with multithread to run") +endif() + +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-condition-variable TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt index 5961bb84ea..e8483f1bc8 100644 --- a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-event-flags TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt index de7dee1a0f..0740eff4fe 100644 --- a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt @@ -3,9 +3,18 @@ include(mbed_greentea) +if(DEFINED TARGET_CORTEX_A) + set(TEST_SKIPPED "test not supported for cortex-A.") +elseif(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + + mbed_greentea_add_test( TEST_NAME mbed-rtos-heap-and-stack TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt index d548420121..62b2bcd5a8 100644 --- a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt @@ -3,9 +3,19 @@ include(mbed_greentea) +if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "mail test cases require RTOS with multithread to run") +endif() + +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-mail TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt index b82b329d6b..83446e6b89 100644 --- a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-malloc TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt index 5903f82e64..4ebc9c2201 100644 --- a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt @@ -3,9 +3,19 @@ include(mbed_greentea) +if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "Mutex test cases require RTOS with multithread to run") +endif() + +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-mutex TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt index 41cd627f00..7bc1e978f9 100644 --- a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt @@ -3,9 +3,19 @@ include(mbed_greentea) +if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "Queue test cases require RTOS with multithread to run") +endif() + +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-queue TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt index 515f402654..5bec129bc9 100644 --- a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-semaphore TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt index 7c95f433fd..9994e484a0 100644 --- a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-signals TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt index bdf12b8d10..d330bf2a7d 100644 --- a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt @@ -3,6 +3,14 @@ include(mbed_greentea) +if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "RTOS basic test cases require RTOS with multithread to run") +endif() + +if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "UsTicker need to be enabled for this test.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-rtos-threads @@ -10,4 +18,6 @@ mbed_greentea_add_test( . TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) From b9439920c05b3c6a36516266aee38abe99251225 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 22 Jul 2021 07:29:31 -0700 Subject: [PATCH 3/4] Update rtos CMake to include greentea test dir --- rtos/CMakeLists.txt | 2 +- rtos/tests/TESTS/CMakeLists.txt | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 rtos/tests/TESTS/CMakeLists.txt diff --git a/rtos/CMakeLists.txt b/rtos/CMakeLists.txt index 8af23d8705..2f32976400 100644 --- a/rtos/CMakeLists.txt +++ b/rtos/CMakeLists.txt @@ -3,7 +3,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) if(BUILD_GREENTEA_TESTS) - # add greentea test + add_subdirectory(tests/TESTS) else() add_subdirectory(tests/UNITTESTS) endif() diff --git a/rtos/tests/TESTS/CMakeLists.txt b/rtos/tests/TESTS/CMakeLists.txt new file mode 100644 index 0000000000..4aad8e8e73 --- /dev/null +++ b/rtos/tests/TESTS/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_subdirectory(mbed_rtos/basic) +add_subdirectory(mbed_rtos/condition_variable) +add_subdirectory(mbed_rtos/event_flags) +add_subdirectory(mbed_rtos/heap_and_stack) +add_subdirectory(mbed_rtos/kernel_tick_count) +add_subdirectory(mbed_rtos/mail) +add_subdirectory(mbed_rtos/malloc) +add_subdirectory(mbed_rtos/MemoryPool) +add_subdirectory(mbed_rtos/mutex) +add_subdirectory(mbed_rtos/queue) +add_subdirectory(mbed_rtos/semaphore) +add_subdirectory(mbed_rtos/signals) +add_subdirectory(mbed_rtos/systimer) +add_subdirectory(mbed_rtos/threads) From 9a144308ec7f6860c463bd9bb2c1b18ca6b801c8 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 2 Sep 2021 12:49:33 +0100 Subject: [PATCH 4/4] Incorporate the review comments --- rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt | 2 +- rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt | 2 +- rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt | 2 +- rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt | 2 +- rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt | 2 +- rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt | 2 +- rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt index c2bbccd2d0..394000ece7 100644 --- a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt @@ -3,7 +3,7 @@ include(mbed_greentea) -if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) +if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL) set(TEST_SKIPPED "RTOS basic test cases require RTOS with multithread to run") endif() diff --git a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt index 88b79ebdd7..4ffb89017a 100644 --- a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt @@ -3,7 +3,7 @@ include(mbed_greentea) -if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) +if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL) set(TEST_SKIPPED "Condition variable test cases require RTOS with multithread to run") endif() diff --git a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt index 0740eff4fe..58d04dbca6 100644 --- a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt @@ -3,7 +3,7 @@ include(mbed_greentea) -if(DEFINED TARGET_CORTEX_A) +if("TARGET_CORTEX_A" IN_LIST MBED_TARGET_DEFINITIONS) set(TEST_SKIPPED "test not supported for cortex-A.") elseif(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS) set(TEST_SKIPPED "UsTicker need to be enabled for this test.") diff --git a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt index 62b2bcd5a8..b311e2a06c 100644 --- a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt @@ -3,7 +3,7 @@ include(mbed_greentea) -if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) +if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL) set(TEST_SKIPPED "mail test cases require RTOS with multithread to run") endif() diff --git a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt index 4ebc9c2201..0d123c9a6e 100644 --- a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt @@ -3,7 +3,7 @@ include(mbed_greentea) -if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) +if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL) set(TEST_SKIPPED "Mutex test cases require RTOS with multithread to run") endif() diff --git a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt index 7bc1e978f9..a66628b0c2 100644 --- a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt @@ -3,7 +3,7 @@ include(mbed_greentea) -if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) +if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL) set(TEST_SKIPPED "Queue test cases require RTOS with multithread to run") endif() diff --git a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt index d330bf2a7d..d40b9cf12c 100644 --- a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt +++ b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt @@ -3,7 +3,7 @@ include(mbed_greentea) -if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL) +if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL) set(TEST_SKIPPED "RTOS basic test cases require RTOS with multithread to run") endif()