mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-04 05:09:53 +01:00
Merge branch 'develop' of git://github.com/BMBurstein/Catch into BMBurstein-develop
This commit is contained in:
commit
c708570d46
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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 ) {
|
||||
|
Loading…
Reference in New Issue
Block a user