From 9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5 Mon Sep 17 00:00:00 2001
From: "zhanyong.wan" <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Tue, 17 Mar 2009 21:03:35 +0000
Subject: Enables death tests on Cygwin and Mac (by Vlad Losev); fixes a python
 test on Mac.

---
 test/gtest-death-test_test.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'test/gtest-death-test_test.cc')

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) {
-- 
cgit v1.2.3