[#4294] --gtest_break_on_failure conflicts with EXPECT_NONFATAL_FAILURE.
This commit is contained in:
parent
5b7fd63d6d
commit
2888f75afd
@ -5342,7 +5342,8 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
|
|||||||
result);
|
result);
|
||||||
|
|
||||||
if (result_type != TestPartResult::kSuccess &&
|
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_break_on_failure takes precedence over
|
||||||
// gtest_throw_on_failure. This allows a user to set the latter
|
// gtest_throw_on_failure. This allows a user to set the latter
|
||||||
// in the code (perhaps in order to use Google Test assertions
|
// in the code (perhaps in order to use Google Test assertions
|
||||||
|
Loading…
Reference in New Issue
Block a user