WIP: fix registration bug

Author: horenmar

extras/CatchAddTests.cmake

@@ -221,6 +221,10 @@ function(catch_discover_tests_impl)
   set(script)
   set(suite)
   set(tests)
+  # Holds the list of all registered test names **as a string**, not list.
+  # This avoids issue of CMake removing semicolon escapes even inside
+  # bracket-quoted strings.
+  set(_test_names)
 
   if(WIN32)
     set(dl_paths_variable_name PATH)
@@ -431,13 +435,23 @@ function(catch_discover_tests_impl)
       string(APPEND script "${_Command}")
     endif()
 
-    list(APPEND tests "${prefix}${plain_name}${suffix}")
+    # The test name has to be escaped using the same rules as prepare_command
+    # uses for the arguments, so that it keeps being single element in list
+    # even with weird characters and semicolons.
+    set(full_list_name "${prefix}${plain_name}${suffix}")
+    string(REPLACE ";" "\\;" full_list_name "${full_list_name}")
+    if(full_list_name MATCHES "[^-./:a-zA-Z0-9_]")
+      # The space before the start of quote is important, so that we get
+      # space-separated list in the final file.
+      string(APPEND _test_names " [==[${full_list_name}]==]")
+    else()
+      string(APPEND _test_names " ${full_list_name}")
+    endif()
   endforeach()
 
   # Create a list of all discovered tests, which users may use to e.g. set
   # properties on the tests
-  prepare_command(set ${_TEST_LIST} ${tests})
-  string(APPEND script "${_Command}")
+  string(APPEND script "set(${_TEST_LIST}${_test_names})\n")
 
   # Write any script leftovers we have
   file(APPEND "${_CTEST_FILE}" "${script}")

tests/TestScripts/DiscoverTests/register-tests.cpp

@@ -40,6 +40,9 @@ class TestCaseFixture {
 
 TEST_CASE_METHOD(TestCaseFixture, "A test case as method", "[tagstagstags]") {}
 
+TEST_CASE("Unclosed right ) parenthesis") {}
+TEST_CASE("Unclosed left ( parenthesis") {}
+
 TEST_CASE( "Newlines\nAnd\rOther\n\tWhitespace", "[whitespace-going-wild]" ) {}
 
 // Some JSON-like and JSON-adjacent characters and substrings in the test names/tags