Merge pull request #14828 from hazzlim/add-cmake-supports-psa-tests

CMake: Add CMake to mbed-psa greentea tests

connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/driver/CMakeLists.txt

@@ -11,6 +11,11 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_REQUIRED_LIBS mbed-ble mbed-events
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        mbed-ble
+        mbed-events
 )

connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/transport/CMakeLists.txt

@@ -11,6 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_REQUIRED_LIBS mbed-ble
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        mbed-ble
 )

connectivity/lorawan/tests/TESTS/lorawan/loraradio/CMakeLists.txt

@@ -11,6 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_REQUIRED_LIBS mbed-lorawan
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        mbed-lorawan
 )

connectivity/mbedtls/tests/TESTS/mbedtls/multi/CMakeLists.txt

@@ -11,7 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
     TEST_REQUIRED_LIBS
         mbed-mbedtls
 )

connectivity/mbedtls/tests/TESTS/mbedtls/sanity/CMakeLists.txt

@@ -11,7 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
     TEST_REQUIRED_LIBS
         mbed-mbedtls
 )

connectivity/mbedtls/tests/TESTS/mbedtls/selftest/CMakeLists.txt

@@ -11,7 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
     TEST_REQUIRED_LIBS
         mbed-mbedtls
 )

connectivity/netsocket/tests/TESTS/netsocket/dns/CMakeLists.txt

@@ -13,6 +13,7 @@ project(${TEST_TARGET})
 list(
     APPEND 
         TEST_SOURCE_LIST
+            main.cpp
             synchronous_dns_multiple.cpp
             synchronous_dns_multi_ip.cpp
             synchronous_dns_invalid.cpp
@@ -32,7 +33,10 @@ list(
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/netsocket/tests/TESTS/netsocket/nidd/CMakeLists.txt

@@ -13,6 +13,7 @@ project(${TEST_TARGET})
 list(
     APPEND
         TEST_SOURCE_LIST
+            main.cpp
             niddsocket_send_timeout.cpp
             niddsocket_send_repeat.cpp
             niddsocket_send_invalid.cpp
@@ -27,7 +28,10 @@ list(
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/netsocket/tests/TESTS/netsocket/tcp/CMakeLists.txt

@@ -13,6 +13,7 @@ project(${TEST_TARGET})
 list(
     APPEND
         TEST_SOURCE_LIST
+            main.cpp
             tcpsocket_thread_per_socket_safety.cpp
             tcpsocket_setsockopt_keepalive_valid.cpp
             tcpsocket_send_timeout.cpp
@@ -36,7 +37,10 @@ list(
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/netsocket/tests/TESTS/netsocket/tls/CMakeLists.txt

@@ -13,6 +13,7 @@ project(${TEST_TARGET})
 list(
     APPEND
         TEST_SOURCE_LIST
+            main.cpp
             tlssocket_simultaneous.cpp
             tlssocket_send_unconnected.cpp
             tlssocket_send_timeout.cpp
@@ -31,7 +32,10 @@ list(
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt

@@ -13,6 +13,7 @@ project(${TEST_TARGET})
 list(
     APPEND
         TEST_SOURCE_LIST
+            main.cpp
             udpsocket_bind_port.cpp
             udpsocket_bind_address_null.cpp
             udpsocket_bind_address_invalid.cpp
@@ -33,7 +34,10 @@ list(
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/netsocket/tests/TESTS/network/emac/CMakeLists.txt

@@ -10,24 +10,30 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_SOURCE_LIST
+list(
-    emac_TestMemoryManager.cpp
+    APPEND
-    emac_TestNetworkStack.cpp
+        TEST_SOURCE_LIST
-    emac_ctp.cpp
+            main.cpp
-    emac_membuf.cpp
+            emac_TestMemoryManager.cpp
-    emac_test_broadcast.cpp
+            emac_TestNetworkStack.cpp
-    emac_test_initialize.cpp
+            emac_ctp.cpp
-    emac_test_memory.cpp
+            emac_membuf.cpp
-    emac_test_multicast_filter.cpp
+            emac_test_broadcast.cpp
-    emac_test_unicast.cpp
+            emac_test_initialize.cpp
-    emac_test_unicast_burst.cpp
+            emac_test_memory.cpp
-    emac_test_unicast_frame_len.cpp
+            emac_test_multicast_filter.cpp
-    emac_test_unicast_long.cpp
+            emac_test_unicast.cpp
-    emac_util.cpp
+            emac_test_unicast_burst.cpp
+            emac_test_unicast_frame_len.cpp
+            emac_test_unicast_long.cpp
+            emac_util.cpp
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-emac
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-emac
 )

connectivity/netsocket/tests/TESTS/network/interface/CMakeLists.txt

@@ -10,13 +10,19 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_SOURCE_LIST
+list(
-    networkinterface_conn_disc_repeat.cpp
+    APPEND
-    networkinterface_status.cpp
+        TEST_SOURCE_LIST
+            main.cpp
+            networkinterface_conn_disc_repeat.cpp
+            networkinterface_status.cpp
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/netsocket/tests/TESTS/network/l3ip/CMakeLists.txt

@@ -10,10 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_SOURCE_LIST cellular_driver_l3ip.cpp)
+list(
+    APPEND
+        TEST_SOURCE_LIST
+            main.cpp
+            cellular_driver_l3ip.cpp
+)
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/netsocket/tests/TESTS/network/multihoming/CMakeLists.txt

@@ -10,14 +10,21 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_SOURCE_LIST
+list(
-    multihoming_asynchronous_dns.cpp
+    APPEND
-    multihoming_synchronous_dns.cpp
+        TEST_SOURCE_LIST
-    multihoming_udpsocket_echotest.cpp
+            main.cpp
+            multihoming_asynchronous_dns.cpp
+            multihoming_synchronous_dns.cpp
+            multihoming_udpsocket_echotest.cpp
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket mbed-nanostack
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
+        mbed-nanostack
 )

connectivity/netsocket/tests/TESTS/network/wifi/CMakeLists.txt

@@ -10,29 +10,35 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_SOURCE_LIST
+list(
-    get_interface.cpp
+    APPEND
-    get_security.cpp
+        TEST_SOURCE_LIST
-    wifi-constructor.cpp
+            main.cpp
-    wifi_connect.cpp
+            get_interface.cpp
-    wifi_connect_disconnect_nonblock.cpp
+            get_security.cpp
-    wifi_connect_disconnect_repeat.cpp
+            wifi-constructor.cpp
-    wifi_connect_nocredentials.cpp
+            wifi_connect.cpp
-    wifi_connect_params_channel.cpp
+            wifi_connect_disconnect_nonblock.cpp
-    wifi_connect_params_channel_fail.cpp
+            wifi_connect_disconnect_repeat.cpp
-    wifi_connect_params_null.cpp
+            wifi_connect_nocredentials.cpp
-    wifi_connect_params_valid_secure.cpp
+            wifi_connect_params_channel.cpp
-    wifi_connect_secure.cpp
+            wifi_connect_params_channel_fail.cpp
-    wifi_connect_secure_fail.cpp
+            wifi_connect_params_null.cpp
-    wifi_get_rssi.cpp
+            wifi_connect_params_valid_secure.cpp
-    wifi_scan.cpp
+            wifi_connect_secure.cpp
-    wifi_scan_null.cpp
+            wifi_connect_secure_fail.cpp
-    wifi_set_channel.cpp
+            wifi_get_rssi.cpp
-    wifi_set_credential.cpp
+            wifi_scan.cpp
+            wifi_scan_null.cpp
+            wifi_set_channel.cpp
+            wifi_set_credential.cpp
 )
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+        ${TEST_TARGET}
-    TEST_REQUIRED_LIBS mbed-netsocket
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS
+        mbed-netsocket
 )

connectivity/nfc/tests/TESTS/nfc/eeprom/CMakeLists.txt

@@ -11,7 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
     TEST_REQUIRED_LIBS
         mbed-nfc
 )

drivers/tests/TESTS/mbed_drivers/buffered_serial/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/c_strings/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/crc/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/dev_null/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/echo/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/flashiap/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/generic_tests/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/lp_ticker/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/lp_timeout/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/lp_timer/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/mem_trace/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/race_test/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/reset_reason/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/rtc/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/sleep_lock/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/stl_features/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/ticker/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/timeout/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/timer/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/timerevent/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/unbuffered_serial/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/watchdog/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

drivers/tests/TESTS/mbed_drivers/watchdog_reset/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

events/tests/TESTS/events/equeue/CMakeLists.txt

@@ -11,6 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_REQUIRED_LIBS mbed-events
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        mbed-events
 )

events/tests/TESTS/events/queue/CMakeLists.txt

@@ -11,6 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_REQUIRED_LIBS mbed-events
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        mbed-events
 )

events/tests/TESTS/events/timing/CMakeLists.txt

@@ -11,6 +11,10 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 project(${TEST_TARGET})
 
 mbed_greentea_add_test(
-    TEST_NAME ${TEST_TARGET}
+    TEST_NAME
-    TEST_REQUIRED_LIBS mbed-events
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        mbed-events
 )

hal/tests/TESTS/mbed_hal/common_tickers/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/common_tickers_freq/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/critical_section/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/flash/functional_tests/CMakeLists.txt

@@ -3,11 +3,16 @@
 
 cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
 
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
+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})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/lp_ticker/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/minimum_requirements/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/mpu/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/ospi/CMakeLists.txt

@@ -10,7 +10,12 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET}
+mbed_greentea_add_test(
-    TEST_SOURCES ospi_test_utils.cpp
+    TEST_NAME
-    TEST_INCLUDE_DIRS flash_configs
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+        ospi_test_utils.cpp
+    TEST_INCLUDE_DIRS
+        flash_configs
 )

hal/tests/TESTS/mbed_hal/pinmap/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/qspi/CMakeLists.txt

@@ -22,10 +22,20 @@ elseif(TARGET mbed-efm32gg11-stk3701)
     set(FLASH_TARGET_CONFIG_HEADER SiliconLabs/EFM32GG11_STK3701)
 endif()
 
-list(APPEND TEST_HEADER_DIRS flash_configs flash_configs/${FLASH_TARGET_CONFIG_HEADER})
+list(
-
+    APPEND
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET}
+        TEST_HEADER_DIRS
-    TEST_SOURCES qspi_test_utils.cpp
+            flash_configs
-    TEST_INCLUDE_DIRS ${TEST_HEADER_DIRS}
+            flash_configs/${FLASH_TARGET_CONFIG_HEADER}
+)
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+        qspi_test_utils.cpp
+    TEST_INCLUDE_DIRS
+        ${TEST_HEADER_DIRS}
 )
 

hal/tests/TESTS/mbed_hal/reset_reason/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/rtc/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/rtc_reset/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/rtc_time/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/rtc_time_conv/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/sleep/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/sleep_manager/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/sleep_manager_racecondition/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/stack_size_unification/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/ticker/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/trng/CMakeLists.txt

@@ -10,10 +10,26 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_SOURCE_LIST base64b/base64b.cpp pithy/pithy.c)
+list(
-list(APPEND TEST_INC_DIRS base64b pithy)
+    APPEND
-
+        TEST_SOURCE_LIST
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET}
+            main.cpp
-    TEST_SOURCES ${TEST_SOURCE_LIST}
+            base64b/base64b.cpp
-    TEST_INCLUDE_DIRS ${TEST_INC_DIRS}
+            pithy/pithy.c
+)
+
+list(
+    APPEND
+        TEST_INC_DIRS
+            base64b
+            pithy
+)
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        ${TEST_SOURCE_LIST}
+    TEST_INCLUDE_DIRS
+        ${TEST_INC_DIRS}
 )

hal/tests/TESTS/mbed_hal/us_ticker/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/watchdog/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/watchdog_reset/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal/watchdog_timing/CMakeLists.txt

@@ -10,4 +10,9 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/CMakeLists.txt

@@ -1,13 +0,0 @@
-# Copyright (c) 2020 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-fpga-ci-test-shield)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET})

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/analogin/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/i2c/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/pwm/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/spi/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/uart/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

hal/tests/TESTS/mbed_timing_fpga_ci_test_shield/watchdog/CMakeLists.txt

@@ -10,6 +10,18 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
 
 project(${TEST_TARGET})
 
-list(APPEND TEST_REQ_LIBS_LIST mbed-fpga-ci-test-shield mbed-storage-blockdevice)
+list(
+    APPEND
+        TEST_REQ_LIBS_LIST
+            mbed-fpga-ci-test-shield
+            mbed-storage-blockdevice
+)
 
-mbed_greentea_add_test(TEST_NAME ${TEST_TARGET} TEST_REQUIRED_LIBS ${TEST_REQ_LIBS_LIST})
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+    TEST_REQUIRED_LIBS
+        ${TEST_REQ_LIBS_LIST}
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/CMakeLists.txt

@@ -6,7 +6,6 @@ target_include_directories(mbed-psa
         inc
         inc/psa
         mbedtls
-        pal
         services/platform
         services/attestation
         services/attestation/qcbor
@@ -28,13 +27,6 @@ target_sources(mbed-psa
         mbedtls/psa_crypto_storage.c
         mbedtls/psa_its_file.c
 
-        pal/pal_attestation_eat.c
-        pal/pal_attestation_intf.c
-        pal/pal_client_api_empty_intf.c
-        pal/pal_client_api_intf.c
-        pal/pal_internal_trusted_storage_intf.c
-        pal/pal_protected_storage_intf.c
-
         services/attestation/attest_boot_status_loader.c
         services/attestation/attest_crypto.c
         services/attestation/attest_crypto_keys.c
@@ -78,3 +70,6 @@ target_link_libraries(mbed-psa
         mbed-storage-kv-global-api
         mbed-device_key
 )
+
+add_subdirectory(test_abstraction_layers)
+

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/attestation/test/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 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-psa-attestation)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME 
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_attestation/test_a001/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-attestation-a001)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_a001.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s001/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s001)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s001.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s002/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s002)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s002.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s003/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s003)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s003.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s004/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s004)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s004.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s005/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s005)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s005.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s006/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s006)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s006.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s007/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s007)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s007.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s008/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s008)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s008.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s009/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s009)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s009.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_its/test_s010/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) 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-psa-compliance-its-s010)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.c
+        test_entry.c
+        test_s010.c
+    TEST_REQUIRED_LIBS
+        mbed-psa-tal
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/crypto_init/test/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 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-psa-crypto-init)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/entropy_inject/test/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 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-psa-entropy-inject)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/its_ps/test/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 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-psa-its-ps)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_add_test(
+    TEST_NAME
+        ${TEST_TARGET}
+    TEST_SOURCES
+        main.cpp
+)

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/test_abstraction_layers/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-psa-tal INTERFACE)
+
+target_include_directories(mbed-psa-tal
+    INTERFACE
+        pal
+        val
+)
+
+target_sources(mbed-psa-tal
+    INTERFACE
+        pal/pal_attestation_eat.c
+        pal/pal_attestation_intf.c
+        pal/pal_client_api_empty_intf.c
+        pal/pal_client_api_intf.c
+        pal/pal_internal_trusted_storage_intf.c
+        pal/pal_protected_storage_intf.c
+        pal/pal_mbed_os_intf.cpp
+
+        val/val_attestation.c
+        val/val_interfaces.c
+        val/val_internal_trusted_storage.c
+        val/val_protected_storage.c
+        val/val_greentea.cpp
+)
+
+target_link_libraries(mbed-psa-tal
+    INTERFACE
+        mbed-psa
+)