From 9c7fcc0c33aa7f200508f1f559ce713d2d120602 Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Tue, 12 Apr 2022 17:33:28 +0200
Subject: [PATCH 1/3] renamed CMake target `check` to `check-ctest`

---
 test/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e99afca4e8b..d3b77b23d82 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -71,7 +71,7 @@ if (BUILD_TESTS)
         ProcessorCount(N)
         set(CTEST_PARALLEL_LEVEL ${N} CACHE STRING "CTest parallel level")
         set(CTEST_TIMEOUT 90 CACHE STRING "CTest timeout")
-        add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout ${CTEST_TIMEOUT}
+        add_custom_target(check-ctest ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout ${CTEST_TIMEOUT}
                 DEPENDS testrunner cppcheck)
 
         set(SKIP_TESTS "" CACHE STRING "A list of tests to skip")

From abb9efccd055b54c21321d1dcbd40046068de207 Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Tue, 12 Apr 2022 17:38:11 +0200
Subject: [PATCH 2/3] added make targets `check` and `test` to CMake

---
 test/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d3b77b23d82..d5862331178 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -59,6 +59,12 @@ if (BUILD_TESTS)
                 DEPENDS cppcheck validateCFG)
     endif()
 
+    add_custom_target(test $<TARGET_FILE:testrunner>
+            DEPENDS cppcheck testrunner)
+
+    add_custom_target(check $<TARGET_FILE:testrunner> -q
+            DEPENDS cppcheck testrunner)
+
     if (REGISTER_TESTS)
         # CMP0064 requires 3.4
         # CMAKE_MATCH_<n> usage for if (MATCHES) requires 3.9
@@ -80,7 +86,7 @@ if (BUILD_TESTS)
             if (${NAME} IN_LIST SKIP_TESTS)
             elseif(TEST ${NAME})
             else()
-                add_test(NAME ${NAME} COMMAND testrunner ${NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+                add_test(NAME ${NAME} COMMAND $<TARGET_FILE:testrunner> ${NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
             endif()
         endfunction()
 

From 4ff8a3eefddb3aefabb21adfb46cb6f8aac31145 Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Tue, 12 Apr 2022 17:41:26 +0200
Subject: [PATCH 3/3] disabled CMake target `test` as the name is reserved by
 CTest [skip ci]

---
 test/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d5862331178..041506d9e33 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -59,8 +59,9 @@ if (BUILD_TESTS)
                 DEPENDS cppcheck validateCFG)
     endif()
 
-    add_custom_target(test $<TARGET_FILE:testrunner>
-            DEPENDS cppcheck testrunner)
+    # TODO: the target name "test" is reservered by CTest
+    #add_custom_target(test $<TARGET_FILE:testrunner>
+    #        DEPENDS cppcheck testrunner)
 
     add_custom_target(check $<TARGET_FILE:testrunner> -q
             DEPENDS cppcheck testrunner)