diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-17 21:03:35 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-17 21:03:35 +0000 |
| commit | 9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5 (patch) | |
| tree | 546adb028be5895120f443878b06482c68f96dfc /test/gtest-death-test_test.cc | |
| parent | 62f8d28c0bd5cb057013fdf5b366db7b7981ec4c (diff) | |
| download | googletest-9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5.tar.gz googletest-9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5.tar.bz2 googletest-9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5.zip | |
Enables death tests on Cygwin and Mac (by Vlad Losev); fixes a python test on Mac.
Diffstat (limited to 'test/gtest-death-test_test.cc')
| -rw-r--r-- | test/gtest-death-test_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc index aa7e31cd..2c283b63 100644 --- a/test/gtest-death-test_test.cc +++ b/test/gtest-death-test_test.cc @@ -41,6 +41,7 @@ #include <direct.h> // For chdir(). #else #include <unistd.h> +#include <sys/wait.h> // For waitpid. #include <limits> // For std::numeric_limits. #endif // GTEST_OS_WINDOWS @@ -414,7 +415,7 @@ void SetPthreadFlag() { } // namespace -#if !GTEST_OS_WINDOWS +#if GTEST_HAS_CLONE TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) { if (!testing::GTEST_FLAG(death_test_use_fork)) { @@ -426,7 +427,7 @@ TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) { } } -#endif // !GTEST_OS_WINDOWS +#endif // GTEST_HAS_CLONE // Tests that a method of another class can be used in a death test. TEST_F(TestForDeathTest, MethodOfAnotherClass) { |