Skip to content

Commit

Permalink
[google#4294] --gtest_break_on_failure conflicts with EXPECT_NONFATAL…
Browse files Browse the repository at this point in the history
…_FAILURE.
  • Loading branch information
avrdan committed Oct 29, 2023
1 parent ed22d4a commit e4b6d06
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion googletest/src/gtest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5352,7 +5352,8 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
result);

if (result_type != TestPartResult::kSuccess &&
result_type != TestPartResult::kSkip) {
result_type != TestPartResult::kSkip &&
result_type != TestPartResult::kNonFatalFailure) {
// gtest_break_on_failure takes precedence over
// gtest_throw_on_failure. This allows a user to set the latter
// in the code (perhaps in order to use Google Test assertions
Expand Down

0 comments on commit e4b6d06

Please sign in to comment.