diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-08-22 12:59:32 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-08-22 12:59:32 -0700 |
| commit | 6609e521245ab788bbd9b773a9f668bfc15f6c29 (patch) | |
| tree | f7ce68369e0f11d25bb90ff08fd1b372e6e46e1d /src/google/protobuf/testing | |
| parent | e416f5d2d3fd9f0ce505ae25732eada12d636a12 (diff) | |
Disable death tests on windows
Also remove cord related code
Diffstat (limited to 'src/google/protobuf/testing')
| -rw-r--r-- | src/google/protobuf/testing/googletest.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |