From 6609e521245ab788bbd9b773a9f668bfc15f6c29 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Tue, 22 Aug 2017 12:59:32 -0700
Subject: Disable death tests on windows

Also remove cord related code
---
 src/google/protobuf/testing/googletest.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/testing')

diff --git a/src/google/protobuf/testing/googletest.h b/src/google/protobuf/testing/googletest.h
index dc4401d0..2db3bfee 100644
--- a/src/google/protobuf/testing/googletest.h
+++ b/src/google/protobuf/testing/googletest.h
@@ -39,7 +39,8 @@
 #include <google/protobuf/stubs/common.h>
 #include <gmock/gmock.h>
 // Disable death tests if we use exceptions in CHECK().
-#if !PROTOBUF_USE_EXCEPTIONS && defined(GTEST_HAS_DEATH_TEST)
+#if !PROTOBUF_USE_EXCEPTIONS && defined(GTEST_HAS_DEATH_TEST) && \
+    !GTEST_OS_WINDOWS
 #define PROTOBUF_HAS_DEATH_TEST
 #endif
 
-- 
cgit v1.2.3