CMake: Refactor mbed_hal 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 mbed_hal greentea CMake accordingly.
2021-08-26 14:14:30 +01:00 · 2021-08-26 14:14:30 +01:00 · 8c81b95d91
parent d1f02f3078
commit 8c81b95d91
25 changed files with 107 additions and 249 deletions
--- a/hal/tests/TESTS/mbed_hal/common_tickers/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/common_tickers/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-hal-common-tickers)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-common-tickers
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/common_tickers_freq/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/common_tickers_freq/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-hal-common-tickers-freq)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-common-tickers-freq
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/crc/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-hal-crc)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-crc
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/critical_section/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/critical_section/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-hal-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-hal-critical-section
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/flash/functional_tests/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/flash/functional_tests/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-hal-flash-functional-tests)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-flash-functional-tests
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/lp_ticker/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/lp_ticker/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-hal-lp-ticker)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-lp-ticker
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/minimum_requirements/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/minimum_requirements/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-hal-minimum-requirements)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-minimum-requirements
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/mpu/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/mpu/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-hal-mpu)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-mpu
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/ospi/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/ospi/CMakeLists.txt
@ -1,21 +1,15 @@
-# 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-hal-ospi)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-ospi
    TEST_SOURCES
        main.cpp
        ospi_test_utils.cpp
    TEST_INCLUDE_DIRS
+        .
        flash_configs
 )
--- a/hal/tests/TESTS/mbed_hal/pinmap/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/pinmap/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-hal-pinmap)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-pinmap
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/qspi/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/qspi/CMakeLists.txt
@ -1,14 +1,7 @@
 # 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-hal-qspi)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 if(TARGET mbed-ep-agora)
    set(FLASH_TARGET_CONFIG_HEADER NORDIC/EP_AGORA)
@ -31,7 +24,7 @@ list(

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-qspi
    TEST_SOURCES
        main.cpp
        qspi_test_utils.cpp
--- a/hal/tests/TESTS/mbed_hal/reset_reason/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/reset_reason/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-hal-reset-reason)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-reset-reason
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/rtc/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/rtc/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-hal-rtc)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-rtc
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/rtc_reset/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/rtc_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-hal-rtc-reset)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-rtc-reset
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/rtc_time/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/rtc_time/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-hal-rtc-time)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-rtc-time
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/rtc_time_conv/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/rtc_time_conv/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-hal-rtc-time-conv)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-rtc-time-conv
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/sleep/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/sleep/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-hal-sleep)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-sleep
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/sleep_manager/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/sleep_manager/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-hal-sleep-manager)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-sleep-manager
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/sleep_manager_racecondition/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/sleep_manager_racecondition/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-hal-sleep-manager-racecondition)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-sleep-manager-racecondition
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/ticker/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/ticker/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-hal-ticker)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-ticker
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/trng/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/trng/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-hal-trng)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 list(
    APPEND
@ -27,7 +20,7 @@ list(

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-trng
    TEST_SOURCES
        ${TEST_SOURCE_LIST}
    TEST_INCLUDE_DIRS
--- a/hal/tests/TESTS/mbed_hal/us_ticker/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/us_ticker/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-hal-us-ticker)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-us-ticker
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/watchdog/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/watchdog/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-hal-watchdog)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-watchdog
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/watchdog_reset/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/watchdog_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-hal-watchdog-reset)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-watchdog-reset
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )
--- a/hal/tests/TESTS/mbed_hal/watchdog_timing/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/watchdog_timing/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-hal-watchdog-timing)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)

 mbed_greentea_add_test(
    TEST_NAME
-        ${TEST_TARGET}
+        mbed-hal-watchdog-timing
+    TEST_INCLUDE_DIRS
+        .
    TEST_SOURCES
        main.cpp
 )