YACA: Check openssl errors even if test passes

Change-Id: Ib1efae6d2edc3a37ed2813ae8774cd66b0522a2f

diff --git a/src/yaca/yaca-test-common.h b/src/yaca/yaca-test-common.h
index a78b4b8..9ba8b20 100644 (file)
--- a/src/yaca/yaca-test-common.h
+++ b/src/yaca/yaca-test-common.h
@@ -49,10 +49,21 @@ do {
                 assertMsg << err;                                                 \
             clear_openssl_errors();                                               \
         }                                                                         \
-        DPL::Test::TestFailed e(#test,                                            \
+        DPL::Test::TestFailed e(#test, __FILE__, __LINE__, assertMsg.str());      \
+        if (!std::uncaught_exception())                                           \
+            throw e;                                                              \
+        DPL::Test::TestRunnerSingleton::Instance().addFailReason(e.GetMessage()); \
+    } else if (!get_openssl_errors().empty()) {                                   \
+        std::ostringstream failMsg;                                               \
+        failMsg << DPL::gdbbacktrace();                              \
+        failMsg << std::endl << "OPENSSL ERRORS:" << std::endl;                 \
+        for (auto &err : get_openssl_errors())                                    \
+            failMsg << err;                                                     \
+        clear_openssl_errors();                                                   \
+        DPL::Test::TestFailed e("Unhandled OpenSSL error",                        \
                                 __FILE__,                                         \
                                 __LINE__,                                         \
-                                assertMsg.str());                                 \
+                                failMsg.str());                                 \
         if (!std::uncaught_exception())                                           \
             throw e;                                                              \
         DPL::Test::TestRunnerSingleton::Instance().addFailReason(e.GetMessage()); \