From 2888f75afda49cb621979280b044174db5a5924f Mon Sep 17 00:00:00 2001 From: Dan Avram Date: Sun, 29 Oct 2023 21:11:59 +0200 Subject: [PATCH] [#4294] --gtest_break_on_failure conflicts with EXPECT_NONFATAL_FAILURE. --- googletest/src/gtest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 99b22ed327..9a3113548e 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -5342,7 +5342,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