Merge branch 'dev' into fix-lightpcapng-build

seladb · Jun 21, 2024 · 00428d1 · 00428d1
2 parents 1e5f6a4 + 6ee2639
commit 00428d1
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Tests/PcppTestFramework/PcppTestFrameworkRun.h b/Tests/PcppTestFramework/PcppTestFrameworkRun.h
@@ -72,7 +72,16 @@ static bool __ptfCheckTags(const std::string &tagSet, const std::string &tagSetT
 			bool memAllocVerbose = __ptfCheckTags("mem_leak_check_verbose", configTagsToRun, false); \
 			MemPlumber::start(memAllocVerbose); \
 		} \
-		TestName(TestName##_result, verboseMode, showSkippedTests); \
+		try \
+		{ \
+			TestName(TestName##_result, verboseMode, showSkippedTests); \
+		} \
+		catch (std::exception const& e) \
+		{ \
+			TestName##_result = PTF_RESULT_FAILED; \
+			std::cout << std::left << std::setw(35) << #TestName << ": FAILED. Unhandled exception occurred! " \
+			<< "Exception: " << e.what() << std::endl; \
+		} \
 		if (runMemLeakCheck) \
 		{ \
 			if (TestName##_result != PTF_RESULT_PASSED) \