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/repeated_field_reflection_unittest.cc | |
| parent | e7194890617095d1857314ef06217a43554a1211 (diff) | |
Update gtest to 1.6; Disable death tests when exceptions are enabled.
Diffstat (limited to 'src/google/protobuf/repeated_field_reflection_unittest.cc')
| -rw-r--r-- | src/google/protobuf/repeated_field_reflection_unittest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/repeated_field_reflection_unittest.cc b/src/google/protobuf/repeated_field_reflection_unittest.cc index 6924ae89..a40162d0 100644 --- a/src/google/protobuf/repeated_field_reflection_unittest.cc +++ b/src/google/protobuf/repeated_field_reflection_unittest.cc @@ -144,6 +144,7 @@ TEST(RepeatedFieldReflectionTest, RegularFields) { EXPECT_EQ(message.repeated_foreign_message(i).c(), Func(i, 7)); } +#ifdef PROTOBUF_HAS_DEATH_TEST // Make sure types are checked correctly at runtime. const FieldDescriptor* fd_optional_int32 = desc->FindFieldByName("optional_int32"); @@ -153,6 +154,7 @@ TEST(RepeatedFieldReflectionTest, RegularFields) { message, fd_repeated_int32), "not the right type"); EXPECT_DEATH(refl->GetRepeatedPtrField<TestAllTypes>( message, fd_repeated_foreign_message), "wrong submessage type"); +#endif // PROTOBUF_HAS_DEATH_TEST } |