From 165ee585a54bfd80bd7eac67b67028222675c8a5 Mon Sep 17 00:00:00 2001 From: laoshanxi <178029200@qq.com> Date: Sat, 10 Oct 2020 09:58:12 +0800 Subject: [PATCH 1/2] Add AppMesh to Open Source projects using Catch --- docs/opensource-users.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/opensource-users.md b/docs/opensource-users.md index cbea85d791..6cc557a892 100644 --- 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. From ff234db122bd1b5c99a1bbf4b56ead8961b1f893 Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Mon, 19 Oct 2020 17:57:00 +0200 Subject: [PATCH 2/2] 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 --- contrib/ParseAndAddCatchTests.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/ParseAndAddCatchTests.cmake b/contrib/ParseAndAddCatchTests.cmake index 9203f163fb..f4575ec8fa 100644 --- 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")