coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-06 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 553c2d5dd77d1b6bd9d1442dc9d0b4b70253ab79 into 1b96fa13f549387b7549cc89e1a785cf143a1a50

Browse Source
This commit is contained in:
Dan Adrian Avram 2025-11-14 12:10:23 +08:00 committed by GitHub
commit 4aa7c72bbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
googletest/src/gtest.cc
View File

@ -5465,7 +5465,8 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
// in the code (perhaps in order to use Google Test assertions
// with another testing framework) and specify the former on the
// command line for debugging.
if (GTEST_FLAG_GET(break_on_failure)) {
if (GTEST_FLAG_GET(break_on_failure) &&
result_type != TestPartResult::kNonFatalFailure) {
#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_PHONE) && \
!defined(GTEST_OS_WINDOWS_RT)
// Using DebugBreak on Windows allows gtest to still break into a debugger

1
googletest/test/googletest-throw-on-failure-test_.cc
View File

@ -54,6 +54,7 @@ int main(int argc, char** argv) {
std::set_terminate(&TerminateHandler);
#endif
testing::InitGoogleTest(&argc, argv);
GTEST_FLAG_SET(throw_on_failure, true);
// We want to ensure that people can use Google Test assertions in
// other testing frameworks, as long as they initialize Google Test