With code proposed in Pull Request #95, when UNITTEST_NO_EXCEPTIONS is defined, the definition for REQUIRE macro is empty.

ohz10 · ohz10 · commit 2e53a17d7e85 · 2016-02-08T21:38:56.000-06:00
This commit adds functionality for stopping unit tests early when UNITTEST_NO_EXCEPTIONS is defined via std::longjmp.
diff --git a/UnitTest++/RequireMacros.h b/UnitTest++/RequireMacros.h
@@ -7,12 +7,6 @@
     #error UnitTest++ redefines REQUIRE
 #endif
 
-#ifndef UNITTEST_NO_EXCEPTIONS
-   #define REQUIRE for(UnitTest::RequiredCheckTestReporter decoratedReporter(*UnitTest::CurrentTest::Results()); decoratedReporter.Next(); )
-#endif
+#define REQUIRE for(UnitTest::RequiredCheckTestReporter decoratedReporter(*UnitTest::CurrentTest::Results()); decoratedReporter.Next(); )
 
-#ifdef UNITTEST_NO_EXCEPTIONS
-   #define REQUIRE
 #endif
-
-#endif
diff --git a/UnitTest++/ThrowingTestReporter.cpp b/UnitTest++/ThrowingTestReporter.cpp
@@ -1,6 +1,10 @@
 #include "ThrowingTestReporter.h"
 #include "RequiredCheckException.h"
 
+#ifdef UNITTEST_NO_EXCEPTIONS
+#include "ReportAssertImpl.h"
+#endif 
+
 namespace UnitTest {
 
    ThrowingTestReporter::ThrowingTestReporter(TestReporter* decoratedReporter)
@@ -27,7 +31,13 @@ namespace UnitTest {
       {
          m_decoratedReporter->ReportFailure(test, failure);
       }
-      throw RequiredCheckException();
+      
+      #ifndef UNITTEST_NO_EXCEPTIONS
+         throw RequiredCheckException();
+      #else
+         static const int stopTest = 1;
+         UNITTEST_LONGJMP(*UnitTest::Detail::GetAssertJmpBuf(), stopTest);
+      #endif
    }
 
    //virtual
diff --git a/tests/TestRequireMacrosWithExceptionsOff.cpp b/tests/TestRequireMacrosWithExceptionsOff.cpp
