diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-04 23:32:47 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-04 23:32:47 +0000 |
| commit | 1d32532ead24125b485125c9644cf915b68016bc (patch) | |
| tree | 4b931ab5c42380b10015b10410056e9a9800f2ba /src/google/protobuf/testing | |
| parent | e7194890617095d1857314ef06217a43554a1211 (diff) | |
Update gtest to 1.6; Disable death tests when exceptions are enabled.
Diffstat (limited to 'src/google/protobuf/testing')
| -rw-r--r-- | src/google/protobuf/testing/googletest.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/testing/googletest.h b/src/google/protobuf/testing/googletest.h index 6b17ae4f..003be106 100644 --- a/src/google/protobuf/testing/googletest.h +++ b/src/google/protobuf/testing/googletest.h @@ -38,6 +38,11 @@ #include <vector> #include <google/protobuf/stubs/common.h> +// Disable death tests if we use exceptions in CHECK(). +#if !PROTOBUF_USE_EXCEPTIONS && defined(GTEST_HAS_DEATH_TEST) +#define PROTOBUF_HAS_DEATH_TEST +#endif + namespace google { namespace protobuf { |