diff options
| author | Phil Nash | 2015-05-18 08:38:50 +0100 |
|---|---|---|
| committer | Phil Nash | 2015-05-18 08:38:50 +0100 |
| commit | c708570d4697f60ff5d5a7232bf0c45b09921652 (patch) | |
| tree | 2f95a8370fa27deaa9b5a27ec4384265fe9e478e /include | |
| parent | 35f4266d0022ed039923fbbba2c4495435ad1465 (diff) | |
| parent | 465454fecca3a2d667c09240dbef22365f7820b2 (diff) | |
| download | catch3-c708570d4697f60ff5d5a7232bf0c45b09921652.tar.gz | |
Merge branch 'develop' of git://github.com/BMBurstein/Catch into BMBurstein-develop
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_result_builder.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_result_type.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/internal/catch_result_builder.hpp b/include/internal/catch_result_builder.hpp index 64e8e9f4..8ce4a4fb 100644 --- a/include/internal/catch_result_builder.hpp +++ b/include/internal/catch_result_builder.hpp @@ -71,7 +71,7 @@ namespace Catch { if( !result.isOk() ) { if( getCurrentContext().getConfig()->shouldDebugBreak() ) m_shouldDebugBreak = true; - if( getCurrentContext().getRunner()->aborting() || m_assertionInfo.resultDisposition == ResultDisposition::Normal ) + if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) ) m_shouldThrow = true; } } diff --git a/include/internal/catch_result_type.h b/include/internal/catch_result_type.h index 31ad3e60..beaff369 100644 --- a/include/internal/catch_result_type.h +++ b/include/internal/catch_result_type.h @@ -41,11 +41,11 @@ namespace Catch { // ResultDisposition::Flags enum struct ResultDisposition { enum Flags { - Normal = 0x00, + Normal = 0x01, - ContinueOnFailure = 0x01, // Failures fail test, but execution continues - FalseTest = 0x02, // Prefix expression with ! - SuppressFail = 0x04 // Failures are reported but do not fail the test + ContinueOnFailure = 0x02, // Failures fail test, but execution continues + FalseTest = 0x04, // Prefix expression with ! + SuppressFail = 0x08 // Failures are reported but do not fail the test }; }; inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) { |