mirror of
https://github.com/google/googletest.git
synced 2025-04-05 13:35:03 +00:00
[#4294] --gtest_break_on_failure conflicts with EXPECT_NONFATAL_FAILURE.
This commit is contained in:
parent
ed22d4a489
commit
e4b6d065c0
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue