diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 23:46:28 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 23:46:28 +0000 |
| commit | bd851333e89517762c91a3fef67cf25a6f1bd37a (patch) | |
| tree | 9b23d718046f2e83236287dca1ad8a7c863a47e5 /test/gtest-death-test_test.cc | |
| parent | f8b268ee86ca74bba3276352f1e7de53d1336c3e (diff) | |
| download | googletest-bd851333e89517762c91a3fef67cf25a6f1bd37a.tar.gz googletest-bd851333e89517762c91a3fef67cf25a6f1bd37a.tar.bz2 googletest-bd851333e89517762c91a3fef67cf25a6f1bd37a.zip | |
Implements test shuffling (by Zhanyong Wan, based on Josh Kelley's original patch).
Enables death tests on minGW (by Vlad Losev).
Diffstat (limited to 'test/gtest-death-test_test.cc')
| -rw-r--r-- | test/gtest-death-test_test.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc index 7bf6a716..288c70a0 100644 --- a/test/gtest-death-test_test.cc +++ b/test/gtest-death-test_test.cc @@ -659,7 +659,11 @@ static void TestExitMacros() { EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), ""); ASSERT_EXIT(_exit(42), testing::ExitedWithCode(42), ""); -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW + // MinGW (as of MinGW 5.1.6 and MSYS 1.0.11) does not tag crashed + // processes with non-zero exit code and does not honor calls to + // SetErrorMode(SEM_NOGPFAULTERRORBOX) that are supposed to suppress + // error pop-ups. EXPECT_EXIT({ testing::GTEST_FLAG(catch_exceptions) = false; *static_cast<int*>(NULL) = 1; @@ -671,7 +675,9 @@ static void TestExitMacros() { *static_cast<int*>(NULL) = 1; }, testing::ExitedWithCode(0), "") << "This failure is expected."; }, "This failure is expected."); +#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW +#if GTEST_OS_WINDOWS // Of all signals effects on the process exit code, only those of SIGABRT // are documented on Windows. // See http://msdn.microsoft.com/en-us/library/dwwzkt4c(VS.71).aspx. |