Update spec/m4/etc.

diff --git a/libmemcached/hosts.cc b/libmemcached/hosts.cc
index c189d07b3548002627a5bdd2405fd14ada6ce9b7..73fb66af0a82eab9abcd87a9b79a11721a01a689 100644 (file)
--- a/libmemcached/hosts.cc
+++ b/libmemcached/hosts.cc
@@ -36,6 +36,7 @@
  */
 
 #include <libmemcached/common.h>
+#include "libmemcached/assert.hpp"
 
 #include <cmath>
 #include <sys/time.h>
@@ -194,6 +195,7 @@ static memcached_return_t update_continuum(memcached_st *ptr)
     ptr->ketama.continuum= new_ptr;
     ptr->ketama.continuum_count= live_servers + MEMCACHED_CONTINUUM_ADDITION;
   }
+  assert_msg(ptr->ketama.continuum, "Programmer Error, empty ketama continuum");
 
   uint64_t total_weight= 0;
   if (memcached_is_weighted_ketama(ptr))
@@ -327,9 +329,9 @@ static memcached_return_t update_continuum(memcached_st *ptr)
     pointer_counter+= pointer_per_server;
   }
 
-  WATCHPOINT_ASSERT(ptr);
-  WATCHPOINT_ASSERT(ptr->ketama.continuum);
-  WATCHPOINT_ASSERT(memcached_server_count(ptr) * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE);
+  assert_msg(ptr, "Programmer Error, no valid ptr");
+  assert_msg(ptr->ketama.continuum, "Programmer Error, empty ketama continuum");
+  assert_msg(memcached_server_count(ptr) * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE, "invalid size information being given to qsort()");
   ptr->ketama.continuum_points_counter= pointer_counter;
   qsort(ptr->ketama.continuum, ptr->ketama.continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp);
 

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index 82d99f09f6e3942bf748f98a2e1219de1ab0460c..d430d116510aec231470a233c3218195f9fabcd5 100644 (file)
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -144,6 +144,7 @@ static void __memcached_free(memcached_st *ptr, bool release_st)
   }
 
   libmemcached_free(ptr, ptr->ketama.continuum);
+  ptr->ketama.continuum= NULL;
 
   memcached_array_free(ptr->_namespace);
   ptr->_namespace= NULL;

diff --git a/libtest/collection.cc b/libtest/collection.cc
index dda1341ae1a32ddd194f502b95c156a96cce0b67..bfd1fac20799ef09aff58e74e6b08293a1591691 100644 (file)
--- a/libtest/collection.cc
+++ b/libtest/collection.cc
@@ -85,7 +85,7 @@ Collection::Collection(Framework* frame_arg,
   _skipped(0),
   _failed(0),
   _total(0),
-  _formatter(_name)
+  _formatter(frame_arg->name(), _name)
 {
   fatal_assert(arg);
 }

diff --git a/libtest/formatter.cc b/libtest/formatter.cc
index 8e6b3ffb282bc089576218bec7367c735fd718be..e0a347a05e862607dad7086cee6cb99f27b07105 100644 (file)
--- a/libtest/formatter.cc
+++ b/libtest/formatter.cc
@@ -88,9 +88,11 @@ private:
   libtest::Timer _timer;
 };
 
-Formatter::Formatter(const std::string& arg) :
-  _suite_name(arg)
+Formatter::Formatter(const std::string& frame_name, const std::string& arg)
 {
+  _suite_name= frame_name;
+  _suite_name+= ".";
+  _suite_name+= arg;
 }
 
 Formatter::~Formatter()

diff --git a/libtest/formatter.hpp b/libtest/formatter.hpp
index be80d5a5137b4b4ec60268ac8fc7f63e8d6dbbf9..10818d40b113e919bbdc1c85dae44fdc4ba3e5fb 100644 (file)
--- a/libtest/formatter.hpp
+++ b/libtest/formatter.hpp
@@ -48,7 +48,7 @@ typedef std::vector<libtest::TestCase*> TestCases;
 
 class Formatter {
 public:
-  Formatter(const std::string& arg);
+  Formatter(const std::string& frame_name, const std::string& arg);
 
   ~Formatter();
 

diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4
index 2d88a018aa6390335ff19ed9b315cee2c9d029da..8750674b830bcbb38ad7f7e70eed5e5144da1481 100644 (file)
--- a/m4/ax_assert.m4
+++ b/m4/ax_assert.m4
@@ -56,9 +56,9 @@ AC_DEFUN([AX_ASSERT],
       [ax_enable_assert=no])
 
     AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" -o "$ac_cv_vcs_checkout" = "yes" ],
-      [ax_enable_assert="yes"
-      AC_DEFINE(NDEBUG,[1],[Define to 1 to enable assert'ing code.])
-      ])
+      [ax_enable_assert="yes"],
+      [ax_enable_assert="no"
+      AC_DEFINE(NDEBUG,[1],[Define to 1 to disable assert'ing code.])])
 
     AC_MSG_CHECKING([for assert])
     AC_MSG_RESULT([$ax_enable_assert])

diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4
index d83a87e9cfbfa8d559336b904b0403a6bed5f481..ba1a9615e06da76a48a2b7de983eb05751221b60 100644 (file)
--- a/m4/ax_debug.m4
+++ b/m4/ax_debug.m4
@@ -49,13 +49,11 @@ AC_DEFUN([AX_DEBUG],
     [AC_PREREQ([2.63])dnl
     AC_ARG_ENABLE([debug],
       [AS_HELP_STRING([--enable-debug],
-        [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],[
-      ax_enable_debug=yes
-      AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.])
-      ],[
-      ax_enable_debug=no
-      AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])
-      ])
+        [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
+      [ax_enable_debug=yes
+      AC_DEFINE(DEBUG,[1],[Define to 1 to enable debugging code.])],
+      [ax_enable_debug=no
+      AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])])
 
     AC_MSG_CHECKING([for debug])
     AC_MSG_RESULT([$ax_enable_debug])

diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4
index 3d5eb2e3500d0fdfb26c8a88124eb2239128df7c..754955e0296f31f79439773c26b05d2629caddc5 100644 (file)
--- a/m4/ax_harden_compiler_flags.m4
+++ b/m4/ax_harden_compiler_flags.m4
@@ -52,7 +52,7 @@
 # ?  _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -- Don't turn on for
 # compatibility issues memcached_stat_st
 
-#serial 6
+#serial 7
 
 AC_DEFUN([_APPEND_LINK_FLAGS_ERROR],
          [AC_REQUIRE([AX_APPEND_LINK_FLAGS])

diff --git a/m4/ax_vcs_checkout.m4 b/m4/ax_vcs_checkout.m4
index 4b094c5603f78b0ffa6b09f6d9e12e13ffb97779..8047b65ec35a5bd4e5321f62394807a877161da5 100644 (file)
--- a/m4/ax_vcs_checkout.m4
+++ b/m4/ax_vcs_checkout.m4
@@ -68,7 +68,8 @@ AC_DEFUN([AX_VCS_CHECKOUT],
         [ac_cv_vcs_checkout=no])
       ])
 
-    AM_CONDITIONAL([IS_VCS_CHECKOUT], [test "x$ac_cv_vcs_checkout" = "xyes"])
-    AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],[AC_DEFINE([VCS_CHECKOUT],[1],[Define if the code was built from VCS.])],
+    AM_CONDITIONAL([IS_VCS_CHECKOUT],[test "x$ac_cv_vcs_checkout" = "xyes"])
+    AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],
+      [AC_DEFINE([VCS_CHECKOUT],[1],[Define if the code was built from VCS.])],
       [AC_DEFINE([VCS_CHECKOUT],[0],[Define if the code was built from VCS.])])
     ])

diff --git a/tests/libmemcached_test_container.h b/tests/libmemcached_test_container.h
index 19fbc272b0e34a3393053c48dd46b569869d4f2d..dd645b91858ff6f783ae69bc4ea5f54b255bb687 100644 (file)
--- a/tests/libmemcached_test_container.h
+++ b/tests/libmemcached_test_container.h
@@ -59,6 +59,7 @@ public:
 
   void parent(memcached_st* arg)
   {
+    assert(_parent != arg);
     reset();
     _parent= arg;
   }