CMake: unittests: Show all tests in CTest report

Previously a test executable was recognised as a single test by CTest.
However, test executables usually contain multiple test cases, the
results of the test cases should be individually reported. With our
previous setup we could miss test case failures that didn't cause the
executable to return an error code.

This commit uses gtest_discover_test to discover all test cases in a
test executable. This enables CTest to match test passes and failures
from the googletest binary output.

connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-common-list-unittest)
 
 add_executable(${TEST_NAME})
@@ -16,6 +18,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-common-util-unittest)
 
 add_executable(${TEST_NAME})
@@ -19,6 +21,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-athandler-unittest)
 
 add_executable(${TEST_NAME})
@@ -39,6 +41,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-cellular-context-unittest)
 
 add_executable(${TEST_NAME})
@@ -45,6 +47,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-cellular-device-unittest)
 
 add_executable(${TEST_NAME})
@@ -41,6 +43,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-cellular-state-machine-unittest)
 
 add_executable(${TEST_NAME})
@@ -43,6 +45,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-unittest)
 
 add_executable(${TEST_NAME})
@@ -45,6 +47,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-channel-plan-unittest)
 
 add_executable(${TEST_NAME})
@@ -29,6 +31,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-command-unittest)
 
 add_executable(${TEST_NAME})
@@ -30,6 +32,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-crypto-unittest)
 
 add_executable(${TEST_NAME})
@@ -28,6 +30,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-unittest)
 
 add_executable(${TEST_NAME})
@@ -33,6 +35,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-as923-unittest)
 
 add_executable(${TEST_NAME})
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-au915-unittest)
 
 add_executable(${TEST_NAME})
@@ -37,6 +39,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-cn470-unittest)
 
 add_executable(${TEST_NAME})
@@ -37,6 +39,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-cn779-unittest)
 
 add_executable(${TEST_NAME})
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-eu433-unittest)
 
 add_executable(${TEST_NAME})
@@ -32,6 +34,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-eu868-unittest)
 
 add_executable(${TEST_NAME})
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-in865-unittest)
 
 add_executable(${TEST_NAME})
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-kr920-unittest)
 
 add_executable(${TEST_NAME})
@@ -32,6 +34,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-us915-unittest)
 
 add_executable(${TEST_NAME})
@@ -38,6 +40,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-lorawan-interface-unittest)
 
 add_executable(${TEST_NAME})
@@ -32,6 +34,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-lorawan-stack-unittest)
 
 add_executable(${TEST_NAME})
@@ -32,6 +34,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-lorawan-timer-unittest)
 
 add_executable(${TEST_NAME})
@@ -28,6 +30,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-cellular-nonip-socket-unittest)
 
 add_executable(${TEST_NAME})
@@ -34,6 +36,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-dtls-socket-unittest)
 
 add_executable(${TEST_NAME})
@@ -42,6 +44,4 @@ set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-dtls-socket-wrapper-unittest)
 
 add_executable(${TEST_NAME})
@@ -41,6 +43,4 @@ set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/U
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-ethernet-interface-unittest)
 
 add_executable(${TEST_NAME})
@@ -36,6 +38,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-iface-dns-socket-unittest)
 
 add_executable(${TEST_NAME})
@@ -50,6 +52,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-internet-socket-unittest)
 
 add_executable(${TEST_NAME})
@@ -33,6 +35,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-network-interface-unittest)
 
 add_executable(${TEST_NAME})
@@ -29,6 +31,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-network-stack-unittest)
 
 add_executable(${TEST_NAME})
@@ -33,6 +35,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-ppp-interface-unittest)
 
 add_executable(${TEST_NAME})
@@ -35,6 +37,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-socket-address-unittest)
 
 add_executable(${TEST_NAME})
@@ -25,6 +27,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-tcp-socket-unittest)
 
 add_executable(${TEST_NAME})
@@ -34,6 +36,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-tls-socket-unittest)
 
 add_executable(${TEST_NAME})
@@ -39,6 +41,4 @@ set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/test_TLSSocket.cpp PROPERT
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-tls-socket-wrapper-unittest)
 
 add_executable(${TEST_NAME})
@@ -42,6 +44,4 @@ set(MBEDTLS_USER_CONFIG_FILE_PATH "\"${mbed-os_SOURCE_DIR}/connectivity/netsocke
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-udp-socket-unittest)
 
 add_executable(${TEST_NAME})
@@ -35,6 +37,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME netsocket-wifi-access-point-unittest)
 
 add_executable(${TEST_NAME})
@@ -19,6 +21,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "netsocket")

drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME pwmout-unittest)
 
 add_executable(${TEST_NAME})
@@ -27,6 +29,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "drivers")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "drivers")

drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME watchdog-unittest)
 
 add_executable(${TEST_NAME})
@@ -28,6 +30,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "drivers")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "drivers")

events/tests/UNITTESTS/equeue/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME equeue-unittest)
 
 add_executable(${TEST_NAME})
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "equeue")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "equeue")

platform/tests/UNITTESTS/CircularBuffer/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME circularbuffer-unittest)
 
 add_executable(${TEST_NAME})
@@ -16,6 +18,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "platform")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "platform")

storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME sfdp-unittest)
 
 add_executable(${TEST_NAME})
@@ -25,6 +27,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "storage")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "storage")

storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME chaining-blockdevice-unittest)
 
 add_executable(${TEST_NAME})
@@ -22,6 +24,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "storage")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "storage")

storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME filesystemstore-unittest)
 
 add_executable(${TEST_NAME})
@@ -43,6 +45,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "storage")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "storage")

storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME tdbstore-unittest)
 
 add_executable(${TEST_NAME})
@@ -25,6 +27,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "storage")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "storage")