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/compiler/cpp/cpp_unittest.cc | |
| parent | e7194890617095d1857314ef06217a43554a1211 (diff) | |
Update gtest to 1.6; Disable death tests when exceptions are enabled.
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_unittest.cc')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_unittest.cc index b5f9ab58..9c6b77ed 100644 --- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc +++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc @@ -556,7 +556,7 @@ TEST(GeneratedMessageTest, NonEmptyMergeFrom) { TestUtil::ExpectAllFieldsSet(message1); } -#ifdef GTEST_HAS_DEATH_TEST +#ifdef PROTOBUF_HAS_DEATH_TEST TEST(GeneratedMessageTest, MergeFromSelf) { unittest::TestAllTypes message; @@ -565,7 +565,7 @@ TEST(GeneratedMessageTest, MergeFromSelf) { "&from"); } -#endif // GTEST_HAS_DEATH_TEST +#endif // PROTOBUF_HAS_DEATH_TEST // Test the generated SerializeWithCachedSizesToArray(), TEST(GeneratedMessageTest, SerializationToArray) { |