From 58dfce93847ece9ae05e70091f982b8882fd3c16 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 3 Dec 2014 12:12:17 -0800
Subject: Update version number in descriptor.pb.h and plugin.pb.h. Protect
 death tests with macro PROTOBUF_HAS_DEATH_TEST.

---
 src/google/protobuf/map_test.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/google/protobuf/map_test.cc')

diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc
index c680ccb2..9db67523 100644
--- a/src/google/protobuf/map_test.cc
+++ b/src/google/protobuf/map_test.cc
@@ -190,6 +190,7 @@ TEST_F(MapImplTest, MutableAt) {
   ExpectSingleElement(key, value2);
 }
 
+#ifdef PROTOBUF_HAS_DEATH_TEST
 TEST_F(MapImplTest, MutableAtNonExistDeathTest) {
   EXPECT_DEATH(map_.at(0), "");
 }
@@ -197,6 +198,7 @@ TEST_F(MapImplTest, MutableAtNonExistDeathTest) {
 TEST_F(MapImplTest, ImmutableAtNonExistDeathTest) {
   EXPECT_DEATH(const_map_.at(0), "");
 }
+#endif  // PROTOBUF_HAS_DEATH_TEST
 
 TEST_F(MapImplTest, CountNonExist) {
   EXPECT_EQ(0, map_.count(0));
-- 
cgit v1.2.3