BIND 10 master, updated. 7c2793d41b23377529c667f89ca1afb69238a7a1 [master] skip EXPECT_DEATH if run-on-valgrind to avoid possible false positives

[BIND 10 source code commits]

The branch, master has been updated
       via  7c2793d41b23377529c667f89ca1afb69238a7a1 (commit)
      from  780a3b3bd3492e500154e53e6835d82eb2eb3131 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c2793d41b23377529c667f89ca1afb69238a7a1
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Jun 18 20:22:52 2013 +0900

    [master] skip EXPECT_DEATH if run-on-valgrind to avoid possible false positives
    
    (and also following our convention) okayed on jabber.

-----------------------------------------------------------------------

Summary of changes:
 .../util/tests/memory_segment_mapped_unittest.cc   |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/tests/memory_segment_mapped_unittest.cc b/src/lib/util/tests/memory_segment_mapped_unittest.cc
index 287ee38..c22b59e 100644
--- a/src/lib/util/tests/memory_segment_mapped_unittest.cc
+++ b/src/lib/util/tests/memory_segment_mapped_unittest.cc
@@ -242,8 +242,10 @@ TEST_F(MemorySegmentMappedTest, badAllocate) {
     const int ret = chmod(mapped_file, 0444);
     ASSERT_EQ(0, ret);
 
-    EXPECT_DEATH_IF_SUPPORTED(
-        {segment_->allocate(DEFAULT_INITIAL_SIZE * 2);}, "");
+    if (!isc::util::unittests::runningOnValgrind()) {
+        EXPECT_DEATH_IF_SUPPORTED(
+            {segment_->allocate(DEFAULT_INITIAL_SIZE * 2);}, "");
+    }
 }
 
 // XXX: this test can cause too strong side effect (creating a very large