diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-20 10:50:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 10:50:41 -0400 |
| commit | 49e6a9b771c2d3cc4f0b3856bfcc7316ae51c1f6 (patch) | |
| tree | 054db67d46b9282759f14f1517e27f3cdc817a59 | |
| parent | 1778f2091e90c9cf36d0f7c01f3da5dd203db3a4 (diff) | |
| parent | c1230dea6b8a9677aaef0cc34d13d6b7a51d9def (diff) | |
| download | googletest-49e6a9b771c2d3cc4f0b3856bfcc7316ae51c1f6.tar.gz googletest-49e6a9b771c2d3cc4f0b3856bfcc7316ae51c1f6.tar.bz2 googletest-49e6a9b771c2d3cc4f0b3856bfcc7316ae51c1f6.zip | |
Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116
Allow death test child to bypass Windows Error Reporting under MinGW
| -rw-r--r-- | googletest/src/gtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index a229549f..888ffd1b 100644 --- a/googletest/src/gtest.cc +++ b/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(), |