BIND 10 master, updated. 6b562b9f7c7df89081cd3e9c98625350a19cbbb7 Fix compilation of EXPECT_DEATH

[BIND 10 source code commits]

The branch, master has been updated
       via  6b562b9f7c7df89081cd3e9c98625350a19cbbb7 (commit)
      from  ee0782b63e4972a3388db5367f7b79a3a1ba2984 (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 6b562b9f7c7df89081cd3e9c98625350a19cbbb7
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jan 31 14:37:37 2012 +0100

    Fix compilation of EXPECT_DEATH
    
    Or, more precisely, avoid compilation of tests using these on systems
    which don't have them.

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

Summary of changes:
 src/lib/server_common/tests/portconfig_unittest.cc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/server_common/tests/portconfig_unittest.cc b/src/lib/server_common/tests/portconfig_unittest.cc
index 7605bc6..ffeb322 100644
--- a/src/lib/server_common/tests/portconfig_unittest.cc
+++ b/src/lib/server_common/tests/portconfig_unittest.cc
@@ -298,6 +298,10 @@ TEST_F(InstallListenAddresses, brokenRollback) {
 // Make sure the death tests are filterable away.
 typedef InstallListenAddresses InstallListenAddressesDeathTest;
 
+// There are systems which don't have EXPECT_DEATH. We skip the tests there.
+// We're lucky, EXPECT_DEATH is a macro, so we can test for its existence this
+// easily.
+#ifdef EXPECT_DEATH
 // We make the socket requestor throw a "fatal" exception, one where we can't be
 // sure the state between processes is consistent. So we abort in that case.
 TEST_F(InstallListenAddressesDeathTest, inconsistent) {
@@ -336,5 +340,6 @@ TEST_F(InstallListenAddressesDeathTest, cantClose) {
     // And reset it back, so it can safely clean up itself.
     sock_requestor_.break_release_ = false;
 }
+#endif // EXPECT_DEATH
 
 }