From 133b9c279021b767a4f056ae54e885c3dc5394dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Thu, 2 Jun 2022 22:26:01 +0200
Subject: [PATCH] some `test/CMakeLists.txt` cleanups (#4067)

* test/CMakeLists.txt: removed unnecessary `CTest` include - gets rid of additional CTest/CDash targets

* test/CMakeLists.txt: adjusted CMake version - `CMAKE_MATCH_<n>` requires 3.9`

* test/CMakeLists.txt: sorted `add_cfg()` calls

* test/CMakeLists.txt: extract test fixtures based on `REGISTER_TEST` macro

* test/CmakeLists.txt: added TODO
---
 test/CMakeLists.txt | 59 +++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f4d7033cd..cb1ed3b60 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -37,6 +37,7 @@ if (BUILD_TESTS)
     add_dependencies(testrunner copy_addons)
 
     if (LIBXML2_XMLLINT_EXECUTABLE)
+        # TODO: run the CMake implementation of the tests
         # TODO: get rid of the copy
         add_custom_target(checkcfg ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cppcheck> ${CMAKE_SOURCE_DIR}
                 COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cfg/runtests.sh
@@ -44,12 +45,12 @@ if (BUILD_TESTS)
     endif()
 
     if (REGISTER_TESTS)
-        cmake_minimum_required(VERSION 3.4) # cmake_policy(SET CMP0064 NEW)
+        # CMP0064 requires 3.4
+        # CMAKE_MATCH_<n> usage for if (MATCHES) requires 3.9
+        cmake_minimum_required(VERSION 3.9)
         cmake_policy(SET CMP0064 NEW)
         cmake_policy(SET CMP0057 NEW)
 
-        include(CTest)
-
         find_package(Threads REQUIRED)
         include(ProcessorCount)
         ProcessorCount(N)
@@ -84,21 +85,14 @@ if (BUILD_TESTS)
             endif()
         endfunction()
 
-        # TODO: what is this?
-        add_fixture(TestSamples WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
         foreach(SRC ${srcs})
-            file(STRINGS ${SRC} FIXTURE_LINE REGEX "TestFixture\\(" LIMIT_COUNT 1)
-            if(FIXTURE_LINE MATCHES "TestFixture\\(\"([a-zA-z0-9]+)\"\\)")
-                add_fixture(${CMAKE_MATCH_1})
-            endif()
+            file(STRINGS ${SRC} FIXTURE_LINE REGEX "^REGISTER_TEST\\([a-zA-z0-9]+\\)$")
+            foreach(_fixture_line ${FIXTURE_LINE})
+                if(_fixture_line MATCHES "^REGISTER_TEST\\(([a-zA-z0-9]+)\\)$")
+                    add_fixture(${CMAKE_MATCH_1})
+                endif()
+            endforeach()
         endforeach()
-        # TODO: parse files for REGISTER_TEST macro
-        add_fixture(TestLeakAutoVarStrcpy)
-        add_fixture(TestLeakAutoVarWindows)
-        add_fixture(TestMemleakInFunction)
-        add_fixture(TestMemleakInClass)
-        add_fixture(TestMemleakStructMember)
-        add_fixture(TestMemleakNoVar)
 
         function(add_cfg CFG_TEST)
             set(options INCONCLUSIVE)
@@ -142,29 +136,30 @@ if (BUILD_TESTS)
                 )
             endif()
         endfunction()
-        add_cfg(posix.c)
-        add_cfg(gnu.c LIBRARY posix;gnu)
-        add_cfg(qt.cpp INCONCLUSIVE)
+        add_cfg(boost.cpp INCONCLUSIVE)
         add_cfg(bsd.c)
+        add_cfg(cairo.c)
+        add_cfg(cppunit.cpp INCONCLUSIVE)
+        add_cfg(gnu.c LIBRARY posix;gnu)
+        add_cfg(googletest.cpp INCONCLUSIVE)
+        add_cfg(gtk.c INCONCLUSIVE)
+        add_cfg(kde.cpp INCONCLUSIVE)
+        add_cfg(libcurl.c)
+        add_cfg(libsigc++.cpp)
+        add_cfg(lua.c)
+        add_cfg(opencv2.cpp)
+        add_cfg(openmp.c)
+        add_cfg(openssl.c)
+        add_cfg(posix.c)
+        add_cfg(python.c)
+        add_cfg(qt.cpp INCONCLUSIVE)
+        add_cfg(sqlite3.c INCONCLUSIVE)
         add_cfg(std.c INCONCLUSIVE)
         add_cfg(std.cpp INCONCLUSIVE)
         add_cfg(windows.cpp INCONCLUSIVE NAME windows32A PLATFORM win32A)
         add_cfg(windows.cpp INCONCLUSIVE NAME windows32W PLATFORM win32W)
         add_cfg(windows.cpp INCONCLUSIVE NAME windows64 PLATFORM win64)
         add_cfg(wxwidgets.cpp INCONCLUSIVE)
-        add_cfg(gtk.c INCONCLUSIVE)
-        add_cfg(boost.cpp INCONCLUSIVE)
-        add_cfg(sqlite3.c INCONCLUSIVE)
-        add_cfg(openmp.c)
-        add_cfg(python.c)
-        add_cfg(lua.c)
-        add_cfg(libcurl.c)
-        add_cfg(cairo.c)
-        add_cfg(googletest.cpp INCONCLUSIVE)
-        add_cfg(kde.cpp INCONCLUSIVE)
-        add_cfg(libsigc++.cpp)
-        add_cfg(openssl.c)
-        add_cfg(opencv2.cpp)
 
         # Set cost of the more expensive tests to help improve parallel scheduling
         # of tests