From 40253b2a543f85c5d4cf9e93bda4db3d549c7bba Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 23 Aug 2021 16:43:44 +0100 Subject: [PATCH 1/3] CMake: Refactor platform 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 platform greentea CMake accordingly. --- .../TESTS/mbed_functional/callback/CMakeLists.txt | 13 +++---------- .../mbed_functional/callback_big/CMakeLists.txt | 13 +++---------- .../mbed_functional/callback_small/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_micro/attributes/CMakeLists.txt | 13 +++---------- .../mbed_micro/call_before_main/CMakeLists.txt | 13 +++---------- .../tests/TESTS/mbed_micro/cpp/CMakeLists.txt | 13 +++---------- .../tests/TESTS/mbed_micro/div/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_micro/static_assert/CMakeLists.txt | 13 +++---------- .../mbed_platform/CircularBuffer/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_platform/FileHandle/CMakeLists.txt | 15 +++++---------- .../TESTS/mbed_platform/SharedPtr/CMakeLists.txt | 13 +++---------- .../mbed_platform/SingletonPtr/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_platform/Stream/CMakeLists.txt | 15 +++++---------- .../mbed_platform/Transaction/CMakeLists.txt | 15 +++++---------- .../TESTS/mbed_platform/atomic/CMakeLists.txt | 13 +++---------- .../mbed_platform/crash_reporting/CMakeLists.txt | 15 +++++---------- .../mbed_platform/critical_section/CMakeLists.txt | 13 +++---------- .../mbed_platform/error_handling/CMakeLists.txt | 15 +++++---------- .../minimal-printf/compliance/CMakeLists.txt | 15 +++++---------- .../TESTS/mbed_platform/stats_cpu/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_platform/stats_heap/CMakeLists.txt | 13 +++---------- .../TESTS/mbed_platform/stats_sys/CMakeLists.txt | 13 +++---------- .../mbed_platform/stats_thread/CMakeLists.txt | 13 +++---------- .../mbed_platform/system_reset/CMakeLists.txt | 15 +++++---------- .../TESTS/mbed_platform/wait_ns/CMakeLists.txt | 15 +++++---------- 25 files changed, 91 insertions(+), 250 deletions(-) diff --git a/platform/tests/TESTS/mbed_functional/callback/CMakeLists.txt b/platform/tests/TESTS/mbed_functional/callback/CMakeLists.txt index 86a6c04830b..fc4aaefe6e2 100644 --- a/platform/tests/TESTS/mbed_functional/callback/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_functional/callback/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-platform-mbed-functional-callback) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-functional-callback TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_functional/callback_big/CMakeLists.txt b/platform/tests/TESTS/mbed_functional/callback_big/CMakeLists.txt index ee96c078846..f6cdba7b48c 100644 --- a/platform/tests/TESTS/mbed_functional/callback_big/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_functional/callback_big/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-platform-mbed-functional-callback-big) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-functional-callback-big TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_functional/callback_small/CMakeLists.txt b/platform/tests/TESTS/mbed_functional/callback_small/CMakeLists.txt index 0a4d8083bf5..40c03086bb4 100644 --- a/platform/tests/TESTS/mbed_functional/callback_small/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_functional/callback_small/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-platform-mbed-functional-callback-small) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-functional-callback-small TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_micro/attributes/CMakeLists.txt b/platform/tests/TESTS/mbed_micro/attributes/CMakeLists.txt index 1a513010d22..ec3fcbd66ed 100644 --- a/platform/tests/TESTS/mbed_micro/attributes/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_micro/attributes/CMakeLists.txt @@ -1,14 +1,7 @@ -# 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-platform-mbed-micro-attributes) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) list( APPEND @@ -20,7 +13,7 @@ list( mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-micro-attributes TEST_SOURCES ${TEST_SOURCE_LIST} ) diff --git a/platform/tests/TESTS/mbed_micro/call_before_main/CMakeLists.txt b/platform/tests/TESTS/mbed_micro/call_before_main/CMakeLists.txt index c89d55fe5a8..4a114ee899a 100644 --- a/platform/tests/TESTS/mbed_micro/call_before_main/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_micro/call_before_main/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-platform-mbed-micro-call-before-main) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-micro-call-before-main TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_micro/cpp/CMakeLists.txt b/platform/tests/TESTS/mbed_micro/cpp/CMakeLists.txt index f04955c1f23..966cc8dccdc 100644 --- a/platform/tests/TESTS/mbed_micro/cpp/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_micro/cpp/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-platform-mbed-micro-cpp) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-micro-cpp TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_micro/div/CMakeLists.txt b/platform/tests/TESTS/mbed_micro/div/CMakeLists.txt index 59cab40394c..809dc794dfb 100644 --- a/platform/tests/TESTS/mbed_micro/div/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_micro/div/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-platform-mbed-micro-div) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-micro-div TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_micro/static_assert/CMakeLists.txt b/platform/tests/TESTS/mbed_micro/static_assert/CMakeLists.txt index a0541701cbc..d59a6d7e114 100644 --- a/platform/tests/TESTS/mbed_micro/static_assert/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_micro/static_assert/CMakeLists.txt @@ -1,14 +1,7 @@ -# 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-platform-mbed-micro-static-assert) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) list( APPEND @@ -20,7 +13,7 @@ list( mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-mbed-micro-static-assert TEST_SOURCES ${TEST_SOURCE_LIST} ) diff --git a/platform/tests/TESTS/mbed_platform/CircularBuffer/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/CircularBuffer/CMakeLists.txt index 459bc857e51..29a42d4808f 100644 --- a/platform/tests/TESTS/mbed_platform/CircularBuffer/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/CircularBuffer/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-platform-circular-buffer) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-circular-buffer TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/FileHandle/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/FileHandle/CMakeLists.txt index d216734ddce..6b4bfa51ddf 100644 --- a/platform/tests/TESTS/mbed_platform/FileHandle/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/FileHandle/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-platform-filehandle) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-filehandle + TEST_INCLUDE_DIRS + . TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/SharedPtr/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/SharedPtr/CMakeLists.txt index 6f4a07806d7..45bbd16bc45 100644 --- a/platform/tests/TESTS/mbed_platform/SharedPtr/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/SharedPtr/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-platform-sharedptr) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-sharedptr TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/SingletonPtr/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/SingletonPtr/CMakeLists.txt index 2821ccd79a0..395c466b0ea 100644 --- a/platform/tests/TESTS/mbed_platform/SingletonPtr/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/SingletonPtr/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-platform-singletonptr) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-singletonptr TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/Stream/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/Stream/CMakeLists.txt index 5ba0c6f6e3a..0febf25b783 100644 --- a/platform/tests/TESTS/mbed_platform/Stream/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/Stream/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-platform-stream) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-stream TEST_SOURCES main.cpp + HOST_TESTS_DIR + "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" ) diff --git a/platform/tests/TESTS/mbed_platform/Transaction/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/Transaction/CMakeLists.txt index 5bb1e3210a8..747b78ec8c5 100644 --- a/platform/tests/TESTS/mbed_platform/Transaction/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/Transaction/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-platform-transaction) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-transaction TEST_SOURCES main.cpp + HOST_TESTS_DIR + "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" ) diff --git a/platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt index e8fa7a72e64..c0403f79376 100644 --- a/platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/atomic/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-platform-atomic) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-atomic TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt index 11bf796c09b..d9a0d5a70fc 100644 --- a/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/crash_reporting/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-platform-crash-reporting) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-crash-reporting TEST_SOURCES main.cpp + HOST_TESTS_DIR + "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" ) diff --git a/platform/tests/TESTS/mbed_platform/critical_section/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/critical_section/CMakeLists.txt index 81a0ea4ab10..7b8e85ce508 100644 --- a/platform/tests/TESTS/mbed_platform/critical_section/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/critical_section/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-platform-critical-section) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-critical-section TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/error_handling/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/error_handling/CMakeLists.txt index db798361c3c..a5a58255030 100644 --- a/platform/tests/TESTS/mbed_platform/error_handling/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/error_handling/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-platform-error-handling) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-error-handling TEST_SOURCES main.cpp + TEST_REQUIRED_LIBS + mbed-storage-littlefs ) diff --git a/platform/tests/TESTS/mbed_platform/minimal-printf/compliance/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/minimal-printf/compliance/CMakeLists.txt index 0e440c071a5..c431a112f05 100644 --- a/platform/tests/TESTS/mbed_platform/minimal-printf/compliance/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/minimal-printf/compliance/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-platform-minimal-printf-compliance) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-minimal-printf-compliance + TEST_INCLUDE_DIRS + . TEST_SOURCES main.cpp mbed_printf.c diff --git a/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt index 427c1e41149..a892f9da5c0 100644 --- a/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_cpu/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-platform-stats-cpu) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-stats-cpu TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt index 4f818c46f5f..66735b7c536 100644 --- a/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_heap/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-platform-stats-heap) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-stats-heap TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt index 1a60541ad8f..d6c88c175fd 100644 --- a/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_sys/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-platform-stats-sys) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-stats-sys TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt index dd633fe0d22..69e1f3420de 100644 --- a/platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_thread/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-platform-stats-thread) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-stats-thread TEST_SOURCES main.cpp ) diff --git a/platform/tests/TESTS/mbed_platform/system_reset/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/system_reset/CMakeLists.txt index 34c8300ed36..6ed96a6f52e 100644 --- a/platform/tests/TESTS/mbed_platform/system_reset/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/system_reset/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-platform-system-reset) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-system-reset TEST_SOURCES main.cpp + HOST_TESTS_DIR + "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" ) diff --git a/platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt index 6bf4c65d6ae..feb54f2f9ea 100644 --- a/platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/wait_ns/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-platform-wait-ns) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +include(mbed_greentea) mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-platform-wait-ns TEST_SOURCES main.cpp + HOST_TESTS_DIR + "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" ) From 16c9058fd123a2cce8af093a347edfd6225e016a Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 23 Aug 2021 18:09:58 +0100 Subject: [PATCH 2/3] CMake: greentea: Add skip reason to platform test --- platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt | 6 ++++++ .../TESTS/mbed_platform/crash_reporting/CMakeLists.txt | 6 ++++++ .../tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt | 7 +++++++ .../tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt | 6 ++++++ .../tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt | 6 ++++++ .../tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt | 6 ++++++ platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt | 6 ++++++ 7 files changed, 43 insertions(+) diff --git a/platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt index c0403f79376..c24a9dce663 100644 --- a/platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/atomic/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(MBED_GREENTEA_TEST_BAREMETAL) + set(TEST_SKIPPED "atomic test cases require a RTOS to run.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-platform-atomic TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt index d9a0d5a70fc..0647c800607 100644 --- a/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt @@ -3,6 +3,10 @@ include(mbed_greentea) +if(NOT DEFINED MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED) + set(TEST_SKIPPED "crash_reporting test not supported.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-platform-crash-reporting @@ -10,4 +14,6 @@ mbed_greentea_add_test( main.cpp HOST_TESTS_DIR "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt index a892f9da5c0..e0b456e2f52 100644 --- a/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt @@ -3,9 +3,16 @@ include(mbed_greentea) +if(NOT DEFINED MBED_CPU_STATS_ENABLED OR NOT "DEVICE_LPTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS + OR NOT "DEVICE_SLEEP=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Stats cpu test not supported.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-platform-stats-cpu TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt index 66735b7c536..1ca4a9c0f54 100644 --- a/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(NOT DEFINED MBED_HEAP_STATS_ENABLED) + set(TEST_SKIPPED "Stats heap test not supported.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-platform-stats-heap TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt index d6c88c175fd..0c94d801392 100644 --- a/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(NOT DEFINED MBED_SYS_STATS_ENABLED) + set(TEST_SKIPPED "System stats test not supported.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-platform-stats-sys TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt index 69e1f3420de..4a830ed41bc 100644 --- a/platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt @@ -3,9 +3,15 @@ include(mbed_greentea) +if(NOT DEFINED MBED_THREAD_STATS_ENABLED) + set(TEST_SKIPPED "Thread stats test not supported.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-platform-stats-thread TEST_SOURCES main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt index feb54f2f9ea..9c671f526b2 100644 --- a/platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt +++ b/platform/tests/TESTS/mbed_platform/wait_ns/CMakeLists.txt @@ -3,6 +3,10 @@ include(mbed_greentea) +if(DEFINED TARGET_ARM_FM) + set(TEST_SKIPPED "Wait ns test not supported.") +endif() + mbed_greentea_add_test( TEST_NAME mbed-platform-wait-ns @@ -10,4 +14,6 @@ mbed_greentea_add_test( main.cpp HOST_TESTS_DIR "${CMAKE_CURRENT_LIST_DIR}/../../host_tests" + TEST_SKIPPED + ${TEST_SKIPPED} ) From 6cc3d6dd179f006c06de0c63bcf5b9dbaedb188c Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 23 Aug 2021 16:44:04 +0100 Subject: [PATCH 3/3] Update platform CMake to include greentea test dir --- platform/CMakeLists.txt | 2 +- platform/tests/TESTS/CMakeLists.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 platform/tests/TESTS/CMakeLists.txt diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 4be54141b6e..8d03c0d4129 100644 --- a/platform/CMakeLists.txt +++ b/platform/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/platform/tests/TESTS/CMakeLists.txt b/platform/tests/TESTS/CMakeLists.txt new file mode 100644 index 00000000000..84c4533a843 --- /dev/null +++ b/platform/tests/TESTS/CMakeLists.txt @@ -0,0 +1,27 @@ +# Copyright (c) 2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_subdirectory(mbed_functional/callback) +add_subdirectory(mbed_functional/callback_big) +add_subdirectory(mbed_functional/callback_small) +add_subdirectory(mbed_micro/attributes) +add_subdirectory(mbed_micro/call_before_main) +add_subdirectory(mbed_micro/cpp) +add_subdirectory(mbed_micro/div) +add_subdirectory(mbed_micro/static_assert) +add_subdirectory(mbed_platform/atomic) +add_subdirectory(mbed_platform/CircularBuffer) +add_subdirectory(mbed_platform/crash_reporting) +add_subdirectory(mbed_platform/error_handling) +add_subdirectory(mbed_platform/FileHandle) +add_subdirectory(mbed_platform/minimal-printf/compliance) +add_subdirectory(mbed_platform/SharedPtr) +add_subdirectory(mbed_platform/SingletonPtr) +add_subdirectory(mbed_platform/Stream) +add_subdirectory(mbed_platform/system_reset) +add_subdirectory(mbed_platform/Transaction) +add_subdirectory(mbed_platform/wait_ns) +add_subdirectory(mbed_platform/stats_cpu) +add_subdirectory(mbed_platform/stats_heap) +add_subdirectory(mbed_platform/stats_sys) +add_subdirectory(mbed_platform/stats_thread)