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_run_context.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_run_context.cpp')
| -rw-r--r-- | include/internal/catch_run_context.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/internal/catch_run_context.cpp b/include/internal/catch_run_context.cpp index 2739284c..7e4b689e 100644 --- a/include/internal/catch_run_context.cpp +++ b/include/internal/catch_run_context.cpp @@ -1,4 +1,5 @@ #include "catch_run_context.h" +#include "catch_compiler_capabilities.h" #include "catch_context.h" #include "catch_enforce.h" #include "catch_random_number_generator.h" @@ -327,7 +328,7 @@ namespace Catch { seedRng(*m_config); Timer timer; - try { + CATCH_TRY { if (m_reporter->getPreferences().shouldRedirectStdOut) { #if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) RedirectedStdOut redirectedStdOut; @@ -347,9 +348,9 @@ namespace Catch { invokeActiveTestCase(); } duration = timer.getElapsedSeconds(); - } catch (TestFailureException&) { + } CATCH_CATCH_ANON (TestFailureException&) { // This just means the test was aborted due to failure - } catch (...) { + } CATCH_CATCH_ALL { // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions // are reported without translation at the point of origin. if( m_shouldReportUnexpected ) { |