From: Mukund Sivaraman <muks@isc.org>
Date: Tue, 8 May 2012 15:00:43 +0000 (+0530)
Subject: [1892] Change EXPECT_ABORT to EXPECT_DEATH
X-Git-Tag: trac2351_base~226^2~158^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3dd1982b72e5f4710e33266310180c71203ce0d;p=thirdparty%2Fkea.git

[1892] Change EXPECT_ABORT to EXPECT_DEATH
---

diff --git a/src/lib/log/tests/log_formatter_unittest.cc b/src/lib/log/tests/log_formatter_unittest.cc
index 4f463c8b72..1aa7e4e049 100644
--- a/src/lib/log/tests/log_formatter_unittest.cc
+++ b/src/lib/log/tests/log_formatter_unittest.cc
@@ -15,9 +15,9 @@
 #include "config.h"
 #include <gtest/gtest.h>
 
-#ifdef EXPECT_ABORT
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
-#endif /* EXPECT_ABORT */
+#endif /* EXPECT_DEATH */
 
 #include <log/log_formatter.h>
 #include <log/logger_level.h>
@@ -102,21 +102,21 @@ TEST_F(FormatterTest, multiArg) {
 
 #ifdef ENABLE_LOGGER_CHECKS
 
-#ifdef EXPECT_ABORT
+#ifdef EXPECT_DEATH
 // Throws MismatchedPlaceholders exception if number of placeholders
 // don't match number of arguments. This causes it to abort.
 TEST_F(FormatterTest, mismatchedPlaceholders) {
-    EXPECT_ABORT({
+    EXPECT_DEATH({
         isc::testutils::dontCreateCoreDumps();
         Formatter(isc::log::INFO, s("Missing the first %2"), this).arg("missing").arg("argument");
     }, ".*");
 
-    EXPECT_ABORT({
+    EXPECT_DEATH({
         isc::testutils::dontCreateCoreDumps();
         Formatter(isc::log::INFO, s("Too many arguments in %1 %2"), this).arg("only one");
     }, ".*");
 }
-#endif /* EXPECT_ABORT */
+#endif /* EXPECT_DEATH */
 
 #else