diff options
| author | Martin Hořeňovský | 2018-09-03 17:52:48 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2018-09-03 21:08:27 +0200 |
| commit | 8b0188385498d6ac101854dc3983c6ebd220adc3 (patch) | |
| tree | 95edc482fa53d85c759a01a611cae6db439bfeca /include/internal/catch_assertionhandler.cpp | |
| parent | 86da2846af20666d85effcecd4c90077477c1ce6 (diff) | |
| download | catch3-8b0188385498d6ac101854dc3983c6ebd220adc3.tar.gz | |
Add support for -fno-exceptions (or equivalent)
This means
* Adding new configuration toggle `CATCH_CONFIG_DISABLE_EXCEPTIONS`
and a best-guess configuration auto-checking for it.
* Adding new set of internal macros, `CATCH_TRY`, `CATCH_CATCH_ALL`
and `CATCH_CATCH_ANON` that can be used in place of regular `try`,
`catch(...)` and `catch(T const&)` respectively, while disappearing
when `CATCH_CONFIG_DISABLE_EXCEPTIONS` is enabled.
* Replacing all uses of `throw` with calls to `Catch::throw_exception`
customization point.
* Providing a default implementation for the above customization point
when `CATCH_CONFIG_DISABLE_EXCEPTIONS` is set.
* Letting users override this implementation with their own.
* Some minor changes and ifdefs all around to support the above
Diffstat (limited to 'include/internal/catch_assertionhandler.cpp')
| -rw-r--r-- | include/internal/catch_assertionhandler.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/internal/catch_assertionhandler.cpp b/include/internal/catch_assertionhandler.cpp index ced52312..77c3f1d4 100644 --- a/include/internal/catch_assertionhandler.cpp +++ b/include/internal/catch_assertionhandler.cpp @@ -81,8 +81,13 @@ namespace Catch { // (To go back to the test and change execution, jump over the throw, next) CATCH_BREAK_INTO_DEBUGGER(); } - if( m_reaction.shouldThrow ) + if (m_reaction.shouldThrow) { +#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) throw Catch::TestFailureException(); +#else + CATCH_ERROR( "Test failure requires aborting test!" ); +#endif + } } void AssertionHandler::setCompleted() { m_completed = true; |