Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116

Allow death test child to bypass Windows Error Reporting under MinGW
pull/1756/head
Gennadiy Civil 7 years ago committed by GitHub
commit 49e6a9b771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      googletest/src/gtest.cc

@ -4698,7 +4698,7 @@ int UnitTest::Run() {
// used for the duration of the program.
impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
#if GTEST_HAS_SEH
#if GTEST_OS_WINDOWS
// Either the user wants Google Test to catch exceptions thrown by the
// tests or this is executing in the context of death test child
// process. In either case the user does not want to see pop-up dialogs
@ -4735,7 +4735,7 @@ int UnitTest::Run() {
_WRITE_ABORT_MSG | _CALL_REPORTFAULT); // pop-up window, core dump.
# endif
}
#endif // GTEST_HAS_SEH
#endif // GTEST_OS_WINDOWS
return internal::HandleExceptionsInMethodIfSupported(
impl(),

Loading…
Cancel
Save