3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-12-16 07:02:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep g_lastAssertionPassed outside of function

Browse Source
This commit is contained in:
Martin Hořeňovský
2025-12-01 23:11:54 +01:00
parent e075e04cde
commit 15d4eb2ebe
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/catch2/internal/catch_run_context.cpp
View File

@@ -182,10 +182,7 @@ namespace Catch {
// the desired semantics on GCC, but not on MSVC). // the desired semantics on GCC, but not on MSVC).
// This is used for the "if" part of CHECKED_IF/CHECKED_ELSE // This is used for the "if" part of CHECKED_IF/CHECKED_ELSE
static bool& g_lastAssertionPassed() { static CATCH_INTERNAL_THREAD_LOCAL bool g_lastAssertionPassed = false;
static CATCH_INTERNAL_THREAD_LOCAL bool value = false;
return value;
}
// This is the source location for last encountered macro. It is // This is the source location for last encountered macro. It is
// used to provide the users with more precise location of error // used to provide the users with more precise location of error
@@ -345,12 +342,12 @@ namespace Catch {
Detail::g_lastKnownLineInfo() = result.m_info.lineInfo; Detail::g_lastKnownLineInfo() = result.m_info.lineInfo;
if (result.getResultType() == ResultWas::Ok) { if (result.getResultType() == ResultWas::Ok) {
m_atomicAssertionCount.passed++; m_atomicAssertionCount.passed++;
Detail::g_lastAssertionPassed() = true; Detail::g_lastAssertionPassed = true;
} else if (result.getResultType() == ResultWas::ExplicitSkip) { } else if (result.getResultType() == ResultWas::ExplicitSkip) {
m_atomicAssertionCount.skipped++; m_atomicAssertionCount.skipped++;
Detail::g_lastAssertionPassed() = true; Detail::g_lastAssertionPassed = true;
} else if (!result.succeeded()) { } else if (!result.succeeded()) {
Detail::g_lastAssertionPassed() = false; Detail::g_lastAssertionPassed = false;
if (result.isOk()) { if (result.isOk()) {
} }
else if( m_activeTestCase->getTestCaseInfo().okToFail() ) // Read from a shared state established before the threads could start, this is fine else if( m_activeTestCase->getTestCaseInfo().okToFail() ) // Read from a shared state established before the threads could start, this is fine
@@ -359,7 +356,7 @@ namespace Catch {
m_atomicAssertionCount.failed++; m_atomicAssertionCount.failed++;
} }
else { else {
Detail::g_lastAssertionPassed() = true; Detail::g_lastAssertionPassed = true;
} }
if ( Detail::g_clearMessageScopes() ) { if ( Detail::g_clearMessageScopes() ) {
@@ -603,14 +600,14 @@ namespace Catch {
} }
bool RunContext::lastAssertionPassed() { bool RunContext::lastAssertionPassed() {
return Detail::g_lastAssertionPassed(); return Detail::g_lastAssertionPassed;
} }
void RunContext::assertionPassedFastPath(SourceLineInfo lineInfo) { void RunContext::assertionPassedFastPath(SourceLineInfo lineInfo) {
// We want to save the line info for better experience with unexpected assertions // We want to save the line info for better experience with unexpected assertions
Detail::g_lastKnownLineInfo() = lineInfo; Detail::g_lastKnownLineInfo() = lineInfo;
++m_atomicAssertionCount.passed; ++m_atomicAssertionCount.passed;
Detail::g_lastAssertionPassed() = true; Detail::g_lastAssertionPassed = true;
Detail::g_clearMessageScopes() = true; Detail::g_clearMessageScopes() = true;
} }