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/reflection_ops_unittest.cc | |
| parent | e7194890617095d1857314ef06217a43554a1211 (diff) | |
| download | protobuf-1d32532ead24125b485125c9644cf915b68016bc.tar.gz protobuf-1d32532ead24125b485125c9644cf915b68016bc.tar.bz2 protobuf-1d32532ead24125b485125c9644cf915b68016bc.zip | |
Update gtest to 1.6; Disable death tests when exceptions are enabled.
Diffstat (limited to 'src/google/protobuf/reflection_ops_unittest.cc')
| -rw-r--r-- | src/google/protobuf/reflection_ops_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/reflection_ops_unittest.cc b/src/google/protobuf/reflection_ops_unittest.cc index 1cd56f1e..29229b5a 100644 --- a/src/google/protobuf/reflection_ops_unittest.cc +++ b/src/google/protobuf/reflection_ops_unittest.cc @@ -152,7 +152,7 @@ TEST(ReflectionOpsTest, MergeUnknown) { EXPECT_EQ(2, message1.unknown_fields().field(1).varint()); } -#ifdef GTEST_HAS_DEATH_TEST +#ifdef PROTOBUF_HAS_DEATH_TEST TEST(ReflectionOpsTest, MergeFromSelf) { // Note: Copy is implemented in terms of Merge() so technically the Copy @@ -165,7 +165,7 @@ TEST(ReflectionOpsTest, MergeFromSelf) { "&from"); } -#endif // GTEST_HAS_DEATH_TEST +#endif // PROTOBUF_HAS_DEATH_TEST TEST(ReflectionOpsTest, Clear) { unittest::TestAllTypes message; |