Merge pull request #191 from snitch-org/fix

Fix build-time reporter toggles and tests
snitch-org · Nov 3, 2024 · fe9249d · fe9249d
2 parents 74bdd8e + 8229ea1
commit fe9249d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -203,7 +203,7 @@ jobs:
       if: matrix.build-type == 'Release' && matrix.platform.publish && github.ref == 'refs/heads/main'
       uses: actions/upload-artifact@v4
       with:
-        name: snitch-build
+        name: snitch-${{matrix.platform.build}}
         path: |
           ${{github.workspace}}/snitch-${{matrix.platform.build}}.zip
 
diff --git a/include/snitch/snitch_config.hpp.config b/include/snitch/snitch_config.hpp.config
@@ -80,8 +80,8 @@
 #if !defined(SNITCH_WITH_TEAMCITY_REPORTER)
 #cmakedefine01 SNITCH_WITH_TEAMCITY_REPORTER
 #endif
-#if !defined(SNITCH_WITH_CATCH2_REPORTER)
-#cmakedefine01 SNITCH_WITH_CATCH2_REPORTER
+#if !defined(SNITCH_WITH_CATCH2_XML_REPORTER)
+#cmakedefine01 SNITCH_WITH_CATCH2_XML_REPORTER
 #endif
 #if !defined(SNITCH_WITH_MULTITHREADING)
 #cmakedefine01 SNITCH_WITH_MULTITHREADING

diff --git a/tests/approval_tests/reporter_catch2_xml.cpp b/tests/approval_tests/reporter_catch2_xml.cpp
@@ -5,6 +5,8 @@
 
 #include <stdexcept>
 
+#if SNITCH_WITH_CATCH2_XML_REPORTER || SNITCH_WITH_ALL_REPORTERS
+
 using namespace std::literals;
 using snitch::matchers::contains_substring;
 
@@ -31,7 +33,7 @@ TEST_CASE("xml reporter", "[reporters]") {
     framework.registry.add_reporter("xml", init, configure, report, finish);
 
     constexpr const char* reporter_name = "xml";
-#define REPORTER_PREFIX "reporter_catch2_xml_"
+#    define REPORTER_PREFIX "reporter_catch2_xml_"
 
     const std::vector<std::regex> ignores = {
         std::regex{R"|(durationInSeconds="([0-9.e+\-]{12})")|"},
@@ -77,3 +79,5 @@ TEST_CASE("xml reporter", "[reporters]") {
         CHECK_FOR_DIFFERENCES(args, ignores, REPORTER_PREFIX "list_tests");
     }
 }
+
+#endif
diff --git a/tests/approval_tests/reporter_teamcity.cpp b/tests/approval_tests/reporter_teamcity.cpp
@@ -5,6 +5,8 @@
 
 #include <stdexcept>
 
+#if SNITCH_WITH_TEAMCITY_REPORTER || SNITCH_WITH_ALL_REPORTERS
+
 using namespace std::literals;
 using snitch::matchers::contains_substring;
 
@@ -23,7 +25,7 @@ TEST_CASE("teamcity reporter", "[reporters]") {
         &snitch::reporter::teamcity::report, {});
 
     constexpr const char* reporter_name = "teamcity";
-#define REPORTER_PREFIX "reporter_teamcity_"
+#    define REPORTER_PREFIX "reporter_teamcity_"
 
     const std::vector<std::regex> ignores = {
         std::regex{R"( duration='([0-9]+)')"},
@@ -62,3 +64,5 @@ TEST_CASE("teamcity reporter", "[reporters]") {
         CHECK_FOR_DIFFERENCES(args, ignores, REPORTER_PREFIX "list_tests");
     }
 }
+
+#endif