Fix indentation in ParseAndAddCatchTests

Consistently use 4 spaces instead of tabs
Fix CMake regex to add tests
2025-01-16 07:08:01 +00:00 · 2020-10-20 13:48:46 +02:00 · 2020-10-20 13:48:14 +02:00 · 2020-10-20 13:48:14 +02:00
2 changed files with 9 additions and 5 deletions
--- a/contrib/ParseAndAddCatchTests.cmake
+++ b/contrib/ParseAndAddCatchTests.cmake
@ -108,7 +108,8 @@ function(ParseAndAddCatchTests_ParseFile SourceFile TestTarget)
    ParseAndAddCatchTests_RemoveComments(Contents)

    # Find definition of test names
-    string(REGEX MATCHALL "[ \t]*(CATCH_)?(TEMPLATE_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([ \t\n]*\"[^\"]*\"[ \t\n]*,[ \t\n]*\"[^\"]*\"([^\(\)]+(\\([^\)]*\\))*)*\\)+[ \t\n]*{+[ \t]*(//[^\n]*[Tt][Ii][Mm][Ee][Oo][Uu][Tt][ \t]*[0-9]+)*" Tests "${Contents}")
+    # https://regex101.com/r/JygOND/1
+    string(REGEX MATCHALL "[ \t]*(CATCH_)?(TEMPLATE_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([ \t\n]*\"[^\"]*\"[ \t\n]*(,[ \t\n]*\"[^\"]*\")?(,[ \t\n]*[^\,\)]*)*\\)[ \t\n]*\{+[ \t]*(//[^\n]*[Tt][Ii][Mm][Ee][Oo][Uu][Tt][ \t]*[0-9]+)*" Tests "${Contents}")

    if(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS AND Tests)
      ParseAndAddCatchTests_PrintDebugMessage("Adding ${SourceFile} to CMAKE_CONFIGURE_DEPENDS property")
@ -197,10 +198,10 @@ function(ParseAndAddCatchTests_ParseFile SourceFile TestTarget)
                set(CTestName "\"${CTestName}\"")
            endif()

-	    # Handle template test cases
-	    if("${TestTypeAndFixture}" MATCHES ".*TEMPLATE_.*")
-	      set(Name "${Name} - *")
-	    endif()
+            # Handle template test cases
+            if("${TestTypeAndFixture}" MATCHES ".*TEMPLATE_.*")
+              set(Name "${Name} - *")
+            endif()

            # Add the test and set its properties
            add_test(NAME "${CTestName}" COMMAND ${OptionalCatchTestLauncher} $<TARGET_FILE:${TestTarget}> ${Name} ${AdditionalCatchParameters})
--- a/docs/opensource-users.md
+++ b/docs/opensource-users.md
@ -94,6 +94,9 @@ A thread-safe header-only mocking framework for C++14.

 ## Applications & Tools

+### [App Mesh](https://github.com/laoshanxi/app-mesh)
+A high available cloud native micro-service application management platform implemented by modern C++.
+
 ### [ArangoDB](https://github.com/arangodb/arangodb)
 ArangoDB is a native multi-model database with flexible data models for documents, graphs, and key-values.
Author	SHA1	Message	Date
Reinhold Gschweicher	2d30df3500	Fix indentation in ParseAndAddCatchTests Consistently use 4 spaces instead of tabs	2020-10-20 13:48:46 +02:00
Reinhold Gschweicher	77b2a7daea	Fix CMake regex to add tests Fix regex that requires two string arguments in the form of TEST_CASE("a", "b") resulting in not finding TEST_CASE("a") entries. See https://regex101.com/r/JygOND/1 Fixes: https://github.com/catchorg/Catch2/issues/2055	2020-10-20 13:48:14 +02:00
laoshanxi	e905edb10f	Add AppMesh to Open Source projects using Catch	2020-10-20 13:48:14 +02:00