BIND 10 master, updated. 7d8efaf11c66fc7dfbb79060ded52f779fd523f8 [1892] Add scaffolding check around resource.h

[BIND 10 source code commits]

The branch, master has been updated
       via  7d8efaf11c66fc7dfbb79060ded52f779fd523f8 (commit)
       via  0a05819f8a0404f2aaa1a0a1ae06caf40a895863 (commit)
      from  c805a1176ab52d0326771b432de744037f0a76fb (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 7d8efaf11c66fc7dfbb79060ded52f779fd523f8
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri May 4 18:24:38 2012 +0530

    [1892] Add scaffolding check around resource.h

commit 0a05819f8a0404f2aaa1a0a1ae06caf40a895863
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri May 4 18:21:14 2012 +0530

    [1880] Add dontCreateCoreDumps() to EXPECT_ABORT tests

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

Summary of changes:
 src/lib/log/tests/log_formatter_unittest.cc        |    9 ++++++++-
 src/lib/log/tests/logger_unittest.cc               |    2 ++
 .../log/tests/message_initializer_2_unittest.cc    |    3 +++
 src/lib/server_common/tests/portconfig_unittest.cc |    6 +++++-
 src/lib/util/tests/buffer_unittest.cc              |    7 +++++--
 5 files changed, 23 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/log_formatter_unittest.cc b/src/lib/log/tests/log_formatter_unittest.cc
index 3fb7689..4f463c8 100644
--- a/src/lib/log/tests/log_formatter_unittest.cc
+++ b/src/lib/log/tests/log_formatter_unittest.cc
@@ -14,6 +14,11 @@
 
 #include "config.h"
 #include <gtest/gtest.h>
+
+#ifdef EXPECT_ABORT
+#include <testutils/resource.h>
+#endif /* EXPECT_ABORT */
+
 #include <log/log_formatter.h>
 #include <log/logger_level.h>
 
@@ -102,11 +107,13 @@ TEST_F(FormatterTest, multiArg) {
 // don't match number of arguments. This causes it to abort.
 TEST_F(FormatterTest, mismatchedPlaceholders) {
     EXPECT_ABORT({
+        isc::testutils::dontCreateCoreDumps();
         Formatter(isc::log::INFO, s("Missing the first %2"), this).arg("missing").arg("argument");
     }, ".*");
 
     EXPECT_ABORT({
-	Formatter(isc::log::INFO, s("Too many arguments in %1 %2"), this).arg("only one");
+        isc::testutils::dontCreateCoreDumps();
+        Formatter(isc::log::INFO, s("Too many arguments in %1 %2"), this).arg("only one");
     }, ".*");
 }
 #endif /* EXPECT_ABORT */
diff --git a/src/lib/log/tests/logger_unittest.cc b/src/lib/log/tests/logger_unittest.cc
index 3be706a..5dddf32 100644
--- a/src/lib/log/tests/logger_unittest.cc
+++ b/src/lib/log/tests/logger_unittest.cc
@@ -17,7 +17,9 @@
 
 #include <gtest/gtest.h>
 
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 #include <log/logger.h>
 #include <log/logger_manager.h>
diff --git a/src/lib/log/tests/message_initializer_2_unittest.cc b/src/lib/log/tests/message_initializer_2_unittest.cc
index 8a338f4..e848a6c 100644
--- a/src/lib/log/tests/message_initializer_2_unittest.cc
+++ b/src/lib/log/tests/message_initializer_2_unittest.cc
@@ -14,7 +14,10 @@
 
 #include <log/message_initializer.h>
 #include <gtest/gtest.h>
+
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 using namespace isc::log;
 
diff --git a/src/lib/server_common/tests/portconfig_unittest.cc b/src/lib/server_common/tests/portconfig_unittest.cc
index 3910e6b..ad8d1e9 100644
--- a/src/lib/server_common/tests/portconfig_unittest.cc
+++ b/src/lib/server_common/tests/portconfig_unittest.cc
@@ -12,17 +12,21 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <gtest/gtest.h>
+
 #include <server_common/portconfig.h>
 #include <testutils/socket_request.h>
 #include <testutils/mockups.h>
+
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
 #include <asiolink/asiolink.h>
 #include <asiodns/asiodns.h>
 
-#include <gtest/gtest.h>
 #include <string>
 
 using namespace isc::server_common::portconfig;
diff --git a/src/lib/util/tests/buffer_unittest.cc b/src/lib/util/tests/buffer_unittest.cc
index 7caa586..ae164ff 100644
--- a/src/lib/util/tests/buffer_unittest.cc
+++ b/src/lib/util/tests/buffer_unittest.cc
@@ -12,13 +12,16 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <gtest/gtest.h>
+
 #include <exceptions/exceptions.h>
+
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 #include <util/buffer.h>
 
-#include <gtest/gtest.h>
-
 using namespace isc;
 
 namespace {