feedc0de/Catch2
1
0
Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

Some RunContext clean-up

Browse Source
This commit is contained in:
Phil Nash
2015-11-19 07:35:35 +00:00
parent 2ebe11660c
commit b77b45a390
9 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_result_builder.hpp
View File

@@ -101,7 +101,7 @@ namespace Catch {
getResultCapture().assertionEnded( result );
if( !result.isOk() ) {
if( getCurrentContext().getConfig()->shouldDebugBreak() )
if( getCurrentConfig()->shouldDebugBreak() )
m_shouldDebugBreak = true;
if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) )
m_shouldThrow = true;
@@ -113,7 +113,7 @@ namespace Catch {
}
bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; }
bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); }
bool ResultBuilder::allowThrows() const { return getCurrentConfig()->allowThrows(); }
AssertionResult ResultBuilder::build() const
{