Remove assert

diff --git a/libtest/fatal.hpp b/libtest/fatal.hpp
index b64b3606e8da253770e183ba6efce2d9566be054..23f47bd9d65b9decad8286ee03ad864160a0be98 100644 (file)
--- a/libtest/fatal.hpp
+++ b/libtest/fatal.hpp
@@ -56,3 +56,4 @@ private:
 } // namespace libtest
 
 #define fatal_message(__mesg) libtest::fatal(LIBYATL_DEFAULT_PARAM, __mesg)
+#define fatal_assert(__assert) if((__assert)) {} else { libtest::fatal(LIBYATL_DEFAULT_PARAM, #__assert); }

diff --git a/tests/hashkit_functions.cc b/tests/hashkit_functions.cc
index 908ad9605cc247ddc75f302654875b6fed3cd9f9..e13a854b794435c881d92d7ee26876ad983403cb 100644 (file)
--- a/tests/hashkit_functions.cc
+++ b/tests/hashkit_functions.cc
@@ -40,7 +40,6 @@
 
 using namespace libtest;
 
-#include <cassert>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>

diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc
index 7fae6d31311bce55c6f4b5e7f34460ca88b4367d..b8f93fb562b039b339a331695d9510502f58f603 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -73,7 +73,7 @@ void get_world(Framework *world)
   if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
   {
     int set_count= atoi(getenv("LIBMEMCACHED_SERVER_NUMBER"));
-    assert(set_count >= 0);
+    fatal_assert(set_count >= 0);
     world->servers().set_count(set_count);
   }
   else

diff --git a/tests/libmemcached-1.0/callbacks.cc b/tests/libmemcached-1.0/callbacks.cc
index 206e60924db5358775fa5445f3136acb94115475..72b2f974a508d106ca082c2ef5a2fb099c065d2f 100644 (file)
--- a/tests/libmemcached-1.0/callbacks.cc
+++ b/tests/libmemcached-1.0/callbacks.cc
@@ -50,8 +50,8 @@ static memcached_return_t delete_trigger(memcached_st *,
                                          const char *key,
                                          size_t key_length)
 {
-  assert(key);
-  assert(key_length);
+  fatal_assert(key);
+  fatal_assert(key_length);
 
   return MEMCACHED_SUCCESS;
 }

diff --git a/tests/libmemcached-1.0/deprecated.cc b/tests/libmemcached-1.0/deprecated.cc
index e98faf406678464af49e6a0a80e4b4ebee5d82e6..d7ebdb0543371d2934b2ffabe1932abeb7e7a790 100644 (file)
--- a/tests/libmemcached-1.0/deprecated.cc
+++ b/tests/libmemcached-1.0/deprecated.cc
@@ -38,8 +38,6 @@
 #include <config.h>
 #include <libtest/test.hpp>
 
-#include <cassert>
-
 #include <libmemcached/memcached.h>
 #include <tests/deprecated.h>
 
@@ -68,7 +66,7 @@ test_return_t server_list_null_test(memcached_st *ptr)
 test_return_t regression_bug_728286(memcached_st *)
 {
   memcached_server_st *servers= memcached_servers_parse("1.2.3.4:99");
-  assert(servers);
+  fatal_assert(servers);
   memcached_server_free(servers);
 
   return TEST_SUCCESS;

diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index d44b5561262be58e5dfc83b52a130b7f208b2b49..a878b2dfd0644e4a84e6c4fb92a31b2617c7c831 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -52,7 +52,6 @@
 
 #include <libhashkit-1.0/hashkit.h>
 
-#include <cassert>
 #include <cerrno>
 #include <memory>
 #include <pthread.h>
@@ -290,7 +289,7 @@ static memcached_return_t server_display_function(const memcached_st *ptr,
   /* Do Nothing */
   size_t bigger= *((size_t *)(context));
   (void)ptr;
-  assert(bigger <= memcached_server_port(server));
+  fatal_assert(bigger <= memcached_server_port(server));
   *((size_t *)(context))= memcached_server_port(server);
 
   return MEMCACHED_SUCCESS;
@@ -2884,7 +2883,7 @@ test_return_t user_supplied_bug20(memcached_st *memc)
 /* sighandler_t function that always asserts false */
 static void fail(int)
 {
-  assert(0);
+  fatal_assert(0);
 }
 
 

diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc
index 03da195a5c7afab2022bebce15c40362610b8feb..b8b4f47af080f237b75e31ae4c720396d62fbc5c 100644 (file)
--- a/tests/libmemcached-1.0/parser.cc
+++ b/tests/libmemcached-1.0/parser.cc
@@ -43,7 +43,6 @@ using namespace libtest;
 #include <vector>
 #include <string>
 #include <cerrno>
-#include <cassert>
 
 #include <libmemcached/memcached.h>
 #include <libmemcached/util.h>
@@ -621,19 +620,19 @@ static memcached_return_t dump_server_information(const memcached_st *,
 {
   if (strcmp(memcached_server_name(instance), "localhost")) 
   {
-    assert(not memcached_server_name(instance));
+    fatal_assert(not memcached_server_name(instance));
     return MEMCACHED_FAILURE;
   }
 
   if (memcached_server_port(instance) < 8888 or memcached_server_port(instance) > 8892)
   {
-    assert(not memcached_server_port(instance));
+    fatal_assert(not memcached_server_port(instance));
     return MEMCACHED_FAILURE;
   }
 
   if (instance->weight > 5 or instance->weight < 2)
   {
-    assert(not instance->weight);
+    fatal_assert(not instance->weight);
     return MEMCACHED_FAILURE;
   }
 

diff --git a/tests/libmemcached-1.0/pool.cc b/tests/libmemcached-1.0/pool.cc
index f6214e0d3b5b5f103de029d2d9f35d9bc7b2b1bf..5b22c94ec8394643ffa87b08c0e3365547442d88 100644 (file)
--- a/tests/libmemcached-1.0/pool.cc
+++ b/tests/libmemcached-1.0/pool.cc
@@ -238,10 +238,9 @@ struct test_pool_context_st {
 static void* connection_release(void *arg)
 {
   test_pool_context_st *resource= static_cast<test_pool_context_st *>(arg);
-  assert(resource);
   if (resource == NULL)
   {
-    abort();
+    fatal_message("resource == NULL");
   }
 
   // Release all of the memc we are holding 

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index cedb8c2fa6e6b8da44428b12a6ae029ea1d4d881..9f8b657ac844babf903fb4cbf579afe77bc92e21 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -39,8 +39,6 @@
 
 #pragma once
 
-#include <cassert>
-
 /* The structure we use for the test system */
 struct libmemcached_test_container_st
 {

diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc
index ff631921351b3ad4e65885b95848ef99fa2a3965..713885fda2e39a3f714d765c5d67dddc77d6a08f 100644 (file)
--- a/tests/mem_udp.cc
+++ b/tests/mem_udp.cc
@@ -51,7 +51,6 @@ using namespace libtest;
 #include <libmemcached/udp.hpp>
 #include <libmemcachedutil-1.0/util.h>
 
-#include <cassert>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>