Merge pull request #187 from snitch-org/cschreib/reporters

Fix reporters not being disabled when requested
snitch-org · Oct 11, 2024 · 2a1808f · 2a1808f
2 parents ecfa3d6 + 760dda6
commit 2a1808f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ snitch.sublime-workspace
 tests/approval_tests/data/actual
 tests/approval_tests/data/blanked
 install/
+.sublime-tests/
diff --git a/include/snitch/snitch_reporter_catch2_xml.hpp b/include/snitch/snitch_reporter_catch2_xml.hpp
@@ -3,7 +3,7 @@
 
 #include "snitch/snitch_config.hpp"
 
-#if defined(SNITCH_WITH_CATCH2_XML_REPORTER) || defined(SNITCH_WITH_ALL_REPORTERS)
+#if SNITCH_WITH_CATCH2_XML_REPORTER || SNITCH_WITH_ALL_REPORTERS
 
 #    include "snitch/snitch_test_data.hpp"
 

diff --git a/include/snitch/snitch_reporter_teamcity.hpp b/include/snitch/snitch_reporter_teamcity.hpp
@@ -3,7 +3,7 @@
 
 #include "snitch/snitch_config.hpp"
 
-#if defined(SNITCH_WITH_TEAMCITY_REPORTER) || defined(SNITCH_WITH_ALL_REPORTERS)
+#if SNITCH_WITH_TEAMCITY_REPORTER || SNITCH_WITH_ALL_REPORTERS
 
 #    include "snitch/snitch_test_data.hpp"
 

diff --git a/snitch.sublime-project b/snitch.sublime-project
@@ -15,6 +15,31 @@
 		{
 		    "format_on_save": true,
 		},
+		"TestExplorer":
+		{
+			"data_location": ".sublime-tests",
+			"frameworks": [
+				{
+					"id": "runtime-tests",
+					"type": "catch2",
+					"executable_pattern": "build/tests/snitch_runtime_tests_self",
+					"path_prefix_style": "basename"
+				},
+				{
+					"id": "runtime-tests-self",
+					"type": "doctest-cpp",
+					"executable_pattern": "build/tests/snitch_runtime_tests",
+					"path_prefix_style": "basename"
+				},
+				{
+					"id": "approval-tests",
+					"type": "doctest-cpp",
+					"executable_pattern": "build/tests/snitch_approval_tests",
+					"cwd": "tests/approval_tests",
+					"path_prefix_style": "basename"
+				},
+			]
+		},
 	},
 	"build_systems":
 	[

diff --git a/src/snitch_reporter_catch2_xml.cpp b/src/snitch_reporter_catch2_xml.cpp
@@ -1,6 +1,6 @@
 #include "snitch/snitch_config.hpp"
 
-#if defined(SNITCH_WITH_CATCH2_XML_REPORTER) || defined(SNITCH_WITH_ALL_REPORTERS)
+#if SNITCH_WITH_CATCH2_XML_REPORTER || SNITCH_WITH_ALL_REPORTERS
 
 #    include "snitch/snitch_macros_reporter.hpp"
 #    include "snitch/snitch_registry.hpp"

diff --git a/src/snitch_reporter_teamcity.cpp b/src/snitch_reporter_teamcity.cpp
@@ -1,6 +1,6 @@
 #include "snitch/snitch_config.hpp"
 
-#if defined(SNITCH_WITH_TEAMCITY_REPORTER) || defined(SNITCH_WITH_ALL_REPORTERS)
+#if SNITCH_WITH_TEAMCITY_REPORTER || SNITCH_WITH_ALL_REPORTERS
 
 #    include "snitch/snitch_macros_reporter.hpp"
 #    include "snitch/snitch_registry.hpp"