Fix formatting of CMake files

2 spaces seems to be the more common indentation level so that's what I unified around.
2025-08-03 05:45:39 +02:00 · 2025-04-07 22:09:59 -06:00
parent 6aac11e17d
commit 8cfca70ae8
16 changed files with 676 additions and 779 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(CatchMiscFunctions)

-if (CATCH_BUILD_SURROGATES)
+if(CATCH_BUILD_SURROGATES)
  message(STATUS "Configuring targets for surrogate TUs")

  # If the folder does not exist before we ask for output redirect to
@@ -11,11 +11,9 @@ if (CATCH_BUILD_SURROGATES)
  # Returns the path to the generated file.
  function(createSurrogateFileTarget sourceHeader pathToFile)
    set(pathPrefix ${PROJECT_SOURCE_DIR}/src)
-
    file(RELATIVE_PATH includePath ${pathPrefix} ${sourceHeader})

    get_filename_component(basicFileName "${sourceHeader}" NAME_WE)
-
    set(surrogateFilePath ${CMAKE_CURRENT_BINARY_DIR}/surrogates/surrogate_${basicFileName}.cpp)

    add_custom_command(
@@ -41,10 +39,9 @@ if (CATCH_BUILD_SURROGATES)
    set(${OutArg} ${AllHeaders} PARENT_SCOPE)
  endfunction()

-
  ExtractCatch2Headers(mainHeaders)

-  if (NOT mainHeaders)
+  if(NOT mainHeaders)
    message(FATAL_ERROR "No headers in the main target were detected. Something is broken.")
  endif()

@@ -53,12 +50,10 @@ if (CATCH_BUILD_SURROGATES)
    list(APPEND surrogateFiles ${pathToGeneratedFile})
  endforeach()

-
  add_executable(Catch2SurrogateTarget
    ${surrogateFiles}
  )
  target_link_libraries(Catch2SurrogateTarget PRIVATE Catch2WithMain)
-
 endif()

 ####
@@ -66,75 +61,72 @@ endif()
 # We need to disable <UseFullPaths> property, but CMake doesn't support it
 # until 3.13 (not yet released)
 ####
-if (MSVC)
-configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user
-               ${CMAKE_BINARY_DIR}/tests
-               COPYONLY)
+if(MSVC)
+  configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user ${CMAKE_BINARY_DIR}/tests COPYONLY)
 endif() #Temporary workaround

-
 # define the sources of the self test
 # Please keep these ordered alphabetically
 set(TEST_SOURCES
-        ${SELF_TEST_DIR}/TestRegistrations.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Algorithms.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/AssertionHandler.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Clara.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/CmdLine.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/CmdLineHelpers.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/ColourImpl.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Details.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/FloatingPoint.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/GeneratorsImpl.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Integer.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/InternalBenchmark.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Json.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Parse.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/PartTracker.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/RandomNumberGeneration.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Reporters.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Tag.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/TestCaseInfoHasher.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/TestSpec.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/TestSpecParser.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/TextFlow.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Sharding.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Stream.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/String.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/StringManip.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Xml.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/Traits.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/ToString.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/UniquePtr.tests.cpp
-        ${SELF_TEST_DIR}/helpers/parse_test_spec.cpp
-        ${SELF_TEST_DIR}/TimingTests/Sleep.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Approx.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/BDD.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Benchmark.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Class.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Compilation.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Condition.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Decomposition.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/EnumToString.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Exception.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Generators.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Message.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Misc.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Skip.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringByte.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringChrono.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringGeneral.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringOptional.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringPair.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringTuple.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringVariant.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringVector.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringWhich.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Tricky.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/VariadicMacros.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/MatchersRanges.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/Matchers.tests.cpp
-        )
+  ${SELF_TEST_DIR}/TestRegistrations.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Algorithms.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/AssertionHandler.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Clara.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/CmdLine.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/CmdLineHelpers.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/ColourImpl.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Details.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/FloatingPoint.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/GeneratorsImpl.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Integer.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/InternalBenchmark.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Json.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Parse.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/PartTracker.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/RandomNumberGeneration.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Reporters.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Tag.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/TestCaseInfoHasher.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/TestSpec.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/TestSpecParser.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/TextFlow.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Sharding.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Stream.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/String.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/StringManip.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Xml.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/Traits.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/ToString.tests.cpp
+  ${SELF_TEST_DIR}/IntrospectiveTests/UniquePtr.tests.cpp
+  ${SELF_TEST_DIR}/helpers/parse_test_spec.cpp
+  ${SELF_TEST_DIR}/TimingTests/Sleep.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Approx.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/BDD.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Benchmark.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Class.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Compilation.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Condition.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Decomposition.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/EnumToString.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Exception.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Generators.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Message.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Misc.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Skip.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringByte.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringChrono.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringGeneral.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringOptional.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringPair.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringTuple.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringVariant.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringVector.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/ToStringWhich.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Tricky.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/VariadicMacros.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/MatchersRanges.tests.cpp
+  ${SELF_TEST_DIR}/UsageTests/Matchers.tests.cpp
+)

 set(TEST_HEADERS
  ${SELF_TEST_DIR}/helpers/parse_test_spec.hpp
@@ -142,46 +134,45 @@ set(TEST_HEADERS
  ${SELF_TEST_DIR}/helpers/type_with_lit_0_comparisons.hpp
 )

-
 # Specify the headers, too, so CLion recognises them as project files
 set(HEADERS
-        ${TOP_LEVEL_HEADERS}
-        ${EXTERNAL_HEADERS}
-        ${INTERNAL_HEADERS}
-        ${REPORTER_HEADERS}
-        ${BENCHMARK_HEADERS}
-        ${BENCHMARK_SOURCES}
+  ${TOP_LEVEL_HEADERS}
+  ${EXTERNAL_HEADERS}
+  ${INTERNAL_HEADERS}
+  ${REPORTER_HEADERS}
+  ${BENCHMARK_HEADERS}
+  ${BENCHMARK_SOURCES}
 )

 # Provide some groupings for IDEs
-#SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
-#SOURCE_GROUP("Tests" FILES ${TEST_SOURCES})
+#source_group("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
+#source_group("Tests" FILES ${TEST_SOURCES})

 include(CTest)

 add_executable(SelfTest ${TEST_SOURCES} ${TEST_HEADERS})
 target_include_directories(SelfTest PRIVATE ${SELF_TEST_DIR})
 target_link_libraries(SelfTest PRIVATE Catch2WithMain)
-if (BUILD_SHARED_LIBS AND WIN32)
-    add_custom_command(TARGET SelfTest PRE_LINK
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Catch2>
-        $<TARGET_FILE:Catch2WithMain> $<TARGET_FILE_DIR:SelfTest>
-    )
+if(BUILD_SHARED_LIBS AND WIN32)
+  add_custom_command(TARGET SelfTest PRE_LINK
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Catch2>
+    $<TARGET_FILE:Catch2WithMain> $<TARGET_FILE_DIR:SelfTest>
+  )
 endif()

-if (CATCH_ENABLE_COVERAGE)
-    set(ENABLE_COVERAGE ON CACHE BOOL "Enable coverage build." FORCE)
-    find_package(codecov)
-    add_coverage(SelfTest)
-    list(APPEND LCOV_REMOVE_PATTERNS "'/usr/*'")
-    coverage_evaluate()
+if(CATCH_ENABLE_COVERAGE)
+  set(ENABLE_COVERAGE ON CACHE BOOL "Enable coverage build." FORCE)
+  find_package(codecov)
+  add_coverage(SelfTest)
+  list(APPEND LCOV_REMOVE_PATTERNS "'/usr/*'")
+  coverage_evaluate()
 endif()

 # configure unit tests via CTest
 add_test(NAME RunTests COMMAND $<TARGET_FILE:SelfTest> --order rand --rng-seed time)
 set_tests_properties(RunTests PROPERTIES
-    FAIL_REGULAR_EXPRESSION "Filters:"
-    COST 15
+  FAIL_REGULAR_EXPRESSION "Filters:"
+  COST 15
 )

 # Because CTest does not allow us to check both return code _and_ expected
@@ -189,8 +180,8 @@ set_tests_properties(RunTests PROPERTIES
 # the output, the second time we check the exit code.
 add_test(NAME List::Tests::Output COMMAND $<TARGET_FILE:SelfTest> --list-tests --verbosity high)
 set_tests_properties(List::Tests::Output PROPERTIES
-    PASS_REGULAR_EXPRESSION "[0-9]+ test cases"
-    FAIL_REGULAR_EXPRESSION "Hidden Test"
+  PASS_REGULAR_EXPRESSION "[0-9]+ test cases"
+  FAIL_REGULAR_EXPRESSION "Hidden Test"
 )
 # This should be equivalent to the old --list-test-names-only and be usable
 # with --input-file.
@@ -198,35 +189,34 @@ add_test(NAME List::Tests::Quiet COMMAND $<TARGET_FILE:SelfTest> --list-tests --
 # Sadly we cannot ask for start-of-line and end-of-line in a ctest regex,
 # so we fail if we see space/tab at the start...
 set_tests_properties(List::Tests::Quiet PROPERTIES
-    PASS_REGULAR_EXPRESSION "\"#1905 -- test spec parser properly clears internal state between compound tests\"[\r\n]"
-    FAIL_REGULAR_EXPRESSION "[ \t]\"#1905 -- test spec parser properly clears internal state between compound tests\""
+  PASS_REGULAR_EXPRESSION "\"#1905 -- test spec parser properly clears internal state between compound tests\"[\r\n]"
+  FAIL_REGULAR_EXPRESSION "[ \t]\"#1905 -- test spec parser properly clears internal state between compound tests\""
 )
 add_test(NAME List::Tests::ExitCode COMMAND $<TARGET_FILE:SelfTest> --list-tests --verbosity high)
 add_test(NAME List::Tests::XmlOutput COMMAND $<TARGET_FILE:SelfTest> --list-tests --verbosity high -r xml)
 set_tests_properties(List::Tests::XmlOutput PROPERTIES
-    PASS_REGULAR_EXPRESSION "<Line>[0-9]+</Line>"
-    FAIL_REGULAR_EXPRESSION "[0-9]+ test cases"
+  PASS_REGULAR_EXPRESSION "<Line>[0-9]+</Line>"
+  FAIL_REGULAR_EXPRESSION "[0-9]+ test cases"
 )

 add_test(NAME List::Tags::Output COMMAND $<TARGET_FILE:SelfTest> --list-tags)
 set_tests_properties(List::Tags::Output PROPERTIES
-    PASS_REGULAR_EXPRESSION "[0-9]+ tags"
-    FAIL_REGULAR_EXPRESSION "\\[\\.\\]")
+  PASS_REGULAR_EXPRESSION "[0-9]+ tags"
+  FAIL_REGULAR_EXPRESSION "\\[\\.\\]")
 add_test(NAME List::Tags::ExitCode COMMAND $<TARGET_FILE:SelfTest> --list-tags)
 add_test(NAME List::Tags::XmlOutput COMMAND $<TARGET_FILE:SelfTest> --list-tags -r xml)
 set_tests_properties(List::Tags::XmlOutput PROPERTIES
-    PASS_REGULAR_EXPRESSION "<Count>18</Count>"
-    FAIL_REGULAR_EXPRESSION "[0-9]+ tags"
+  PASS_REGULAR_EXPRESSION "<Count>18</Count>"
+  FAIL_REGULAR_EXPRESSION "[0-9]+ tags"
 )

-
 add_test(NAME List::Reporters::Output COMMAND $<TARGET_FILE:SelfTest> --list-reporters)
 set_tests_properties(List::Reporters::Output PROPERTIES PASS_REGULAR_EXPRESSION "Available reporters:")
 add_test(NAME List::Reporters::ExitCode COMMAND $<TARGET_FILE:SelfTest> --list-reporters)
 add_test(NAME List::Reporters::XmlOutput COMMAND $<TARGET_FILE:SelfTest> --list-reporters -r xml)
 set_tests_properties(List::Reporters::XmlOutput PROPERTIES
-    PASS_REGULAR_EXPRESSION "<Name>compact</Name>"
-    FAIL_REGULAR_EXPRESSION "Available reporters:"
+  PASS_REGULAR_EXPRESSION "<Name>compact</Name>"
+  FAIL_REGULAR_EXPRESSION "Available reporters:"
 )

 add_test(NAME List::Listeners::Output
@@ -263,8 +253,8 @@ add_test(NAME TestSpecs::CombiningMatchingAndNonMatchingIsOk-1 COMMAND $<TARGET_

 add_test(NAME TestSpecs::CombiningMatchingAndNonMatchingIsOk-2 COMMAND $<TARGET_FILE:SelfTest> Tracker, "___nonexistent_test___")
 set_tests_properties(TestSpecs::CombiningMatchingAndNonMatchingIsOk-2 PROPERTIES
-    PASS_REGULAR_EXPRESSION "No test cases matched '\"___nonexistent_test___\"'"
-    FAIL_REGULAR_EXPRESSION "No tests ran"
+  PASS_REGULAR_EXPRESSION "No test cases matched '\"___nonexistent_test___\"'"
+  FAIL_REGULAR_EXPRESSION "No tests ran"
 )

 add_test(NAME TestSpecs::NoMatchedTestsFail
@@ -283,7 +273,7 @@ add_test(NAME TestSpecs::OverrideAllSkipFailure
 )

 add_test(NAME TestSpecs::NonMatchingTestSpecIsRoundTrippable
-    COMMAND $<TARGET_FILE:SelfTest> Tracker, "this test does not exist" "[nor does this tag]"
+  COMMAND $<TARGET_FILE:SelfTest> Tracker, "this test does not exist" "[nor does this tag]"
 )
 set_tests_properties(TestSpecs::NonMatchingTestSpecIsRoundTrippable
  PROPERTIES
@@ -447,7 +437,6 @@ set_tests_properties("Benchmarking::SkipBenchmarkMacros"
    FAIL_REGULAR_EXPRESSION "benchmark name"
 )

-
 add_test(NAME "Benchmarking::FailureReporting::OptimizedOut"
  COMMAND
    $<TARGET_FILE:SelfTest> "Failing benchmarks" -c "empty" -r xml
@@ -510,7 +499,7 @@ set_tests_properties("ErrorHandling::InvalidTestSpecExitsEarly"
    FAIL_REGULAR_EXPRESSION "No tests ran"
 )

-if (MSVC)
+if(MSVC)
  set(_NullFile "NUL")
 else()
  set(_NullFile "/dev/null")
@@ -519,7 +508,7 @@ endif()
 # This test checks that there is nothing written out from the process,
 # but if CMake is running the tests under Valgrind or similar tool, then
 # that will write its own output to stdout and the test would fail.
-if (NOT MEMORYCHECK_COMMAND)
+if(NOT MEMORYCHECK_COMMAND)
  add_test(NAME "MultiReporter::CapturingReportersDontPropagateStdOut"
    COMMAND
      $<TARGET_FILE:SelfTest> "Sends stuff to stdout and stderr"
@@ -608,76 +597,71 @@ set_tests_properties("Reporters::JUnit::NamespacesAreNormalized"
    PASS_REGULAR_EXPRESSION "testcase classname=\"SelfTest(\.exe)?\\.A\\.B\\.TestClass\""
 )

-if (CATCH_ENABLE_CONFIGURE_TESTS)
-    foreach(testName "DefaultReporter" "Disable" "DisableStringification"
-                     "ExperimentalRedirect")
-
-        add_test(NAME "CMakeConfig::${testName}"
-          COMMAND
-            "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/TestScripts/testConfigure${testName}.py" "${CATCH_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
-        )
-        set_tests_properties("CMakeConfig::${testName}"
-          PROPERTIES
-            COST 240
-            LABELS "uses-python"
-        )
-
-    endforeach()
-endif()
-
-if (CATCH_ENABLE_CMAKE_HELPER_TESTS)
-    add_test(NAME "CMakeHelper::DiscoverTests"
+if(CATCH_ENABLE_CONFIGURE_TESTS)
+  foreach(testName "DefaultReporter" "Disable" "DisableStringification"
+                    "ExperimentalRedirect")
+    add_test(NAME "CMakeConfig::${testName}"
      COMMAND
-        "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/TestScripts/DiscoverTests/VerifyRegistration.py" "${CATCH_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
+        "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/TestScripts/testConfigure${testName}.py" "${CATCH_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
    )
-    set_tests_properties("CMakeHelper::DiscoverTests"
+    set_tests_properties("CMakeConfig::${testName}"
      PROPERTIES
        COST 240
        LABELS "uses-python"
    )
+  endforeach()
 endif()

-foreach (reporterName # "Automake" - the simple .trs format does not support any kind of comments/metadata
-                      "compact"
-                      "console"
-                      "JUnit"
-                      "SonarQube"
-                      "TAP"
-                      # "TeamCity" - does not seem to support test suite-level metadata/comments
-                      "XML"
-                      "JSON")
+if(CATCH_ENABLE_CMAKE_HELPER_TESTS)
+  add_test(NAME "CMakeHelper::DiscoverTests"
+    COMMAND
+      "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/TestScripts/DiscoverTests/VerifyRegistration.py" "${CATCH_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
+  )
+  set_tests_properties("CMakeHelper::DiscoverTests"
+    PROPERTIES
+      COST 240
+      LABELS "uses-python"
+  )
+endif()

-    add_test(NAME "Reporters:Filters:${reporterName}"
-      COMMAND
-        $<TARGET_FILE:SelfTest> [comparisons][string-case] "CaseInsensitiveLess is case insensitive"
-          --reporter ${reporterName}
-    )
-    # Different regex for these two reporters, because the commas end up xml-escaped
-    if (reporterName MATCHES "JUnit|XML")
-      set(testCaseNameFormat "&quot;CaseInsensitiveLess is case insensitive&quot;")
-    elseif(reporterName MATCHES "JSON")
-      set(testCaseNameFormat "\\\\\"CaseInsensitiveLess is case insensitive\\\\\"")
-    else()
-      set(testCaseNameFormat "\"CaseInsensitiveLess is case insensitive\"")
-    endif()
-    set_tests_properties("Reporters:Filters:${reporterName}"
-      PROPERTIES
-        PASS_REGULAR_EXPRESSION "[fF]ilters.+\\[comparisons\\] \\[string-case\\] ${testCaseNameFormat}"
-    )
-
-    add_test(NAME "Reporters:RngSeed:${reporterName}"
-      COMMAND
-        $<TARGET_FILE:SelfTest> "Factorials are computed"
-          --reporter ${reporterName}
-          --rng-seed 18181818
-    )
-    set_tests_properties("Reporters:RngSeed:${reporterName}"
-      PROPERTIES
-        PASS_REGULAR_EXPRESSION "18181818"
-    )
+foreach(reporterName # "Automake" - the simple .trs format does not support any kind of comments/metadata
+                       "compact"
+                       "console"
+                       "JUnit"
+                       "SonarQube"
+                       "TAP"
+                     # "TeamCity" - does not seem to support test suite-level metadata/comments
+                       "XML"
+                       "JSON")
+  add_test(NAME "Reporters:Filters:${reporterName}"
+    COMMAND
+      $<TARGET_FILE:SelfTest> [comparisons][string-case] "CaseInsensitiveLess is case insensitive"
+        --reporter ${reporterName}
+  )
+  # Different regex for these two reporters, because the commas end up xml-escaped
+  if(reporterName MATCHES "JUnit|XML")
+    set(testCaseNameFormat "&quot;CaseInsensitiveLess is case insensitive&quot;")
+  elseif(reporterName MATCHES "JSON")
+    set(testCaseNameFormat "\\\\\"CaseInsensitiveLess is case insensitive\\\\\"")
+  else()
+    set(testCaseNameFormat "\"CaseInsensitiveLess is case insensitive\"")
+  endif()
+  set_tests_properties("Reporters:Filters:${reporterName}"
+    PROPERTIES
+      PASS_REGULAR_EXPRESSION "[fF]ilters.+\\[comparisons\\] \\[string-case\\] ${testCaseNameFormat}"
+  )

+  add_test(NAME "Reporters:RngSeed:${reporterName}"
+    COMMAND
+      $<TARGET_FILE:SelfTest> "Factorials are computed"
+        --reporter ${reporterName}
+        --rng-seed 18181818
+  )
+  set_tests_properties("Reporters:RngSeed:${reporterName}"
+    PROPERTIES
+      PASS_REGULAR_EXPRESSION "18181818"
+  )
 endforeach()

-
 list(APPEND CATCH_WARNING_TARGETS SelfTest)
 set(CATCH_WARNING_TARGETS ${CATCH_WARNING_TARGETS} PARENT_SCOPE)