From 174e01667fd98a20a339e5b8c5bfe17b2d76db78 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 22 Jul 2021 07:29:00 -0700 Subject: [PATCH] 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 )