Merge for release

diff --git a/ChangeLog b/ChangeLog
index 76285fa62a86232355f215da529c5f8a970c0cab..7005b567841c40ed29d9a73bed668c1907feba8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,7 @@
-1.0.10
+1.0.10 Sun Jul 29 21:50:15 PDT 2012
 * --disable-assert has been removed from configure, and --enable-assert has been added in its place.
 * Compiling fixes for Clang on OSX Mountain Lion.
 
-
 1.0.9 Wed Jul  4 22:46:19 EDT 2012
 * Faster close on socket.
 * Instance allocation is now seperated from server interface. This should allow for a better preservation of ABI compliance from now on.

diff --git a/Makefile.am b/Makefile.am
index fa4bf7260f4b29c6bc17a422601790737fdd84a9..a548c9823be72f5bf9934a332cb0399c2444529e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,8 +31,6 @@ EXTRA_DIST+= config/uncrustify.cfg
 
 include libtest/include.am
 
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-
 include libhashkit-1.0/include.am
 include libmemcached-1.0/include.am
 include libmemcachedprotocol-0.0/include.am
@@ -53,7 +51,11 @@ include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
+
+if HAVE_LIBEVENT
 include memcached/include.am
+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+endif
 
 docs: html man
 

diff --git a/tests/libmemcached-1.0/all_tests.h b/tests/libmemcached-1.0/all_tests.h
index a3a8dcfc7283b6a1698c1245af9271047cc0f0e7..25fda094923cca50e01211cb4518b5d44b17b8e3 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.h
+++ b/tests/libmemcached-1.0/all_tests.h
@@ -277,6 +277,7 @@ test_st regression_tests[]= {
   {"lp:996813", true, (test_callback_fn*)regression_996813_TEST },
   {"lp:994772", true, (test_callback_fn*)regression_994772_TEST },
   {"lp:1009493", true, (test_callback_fn*)regression_1009493_TEST },
+  {"lp:1021819", true, (test_callback_fn*)regression_1021819_TEST },
   {0, false, (test_callback_fn*)0}
 };
 

diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index 9fdf6bf3fdd934990ac415bf239d447ce84dddde..07603cb4219c4f60bacf8b29c3c0431eb6994bd8 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -4474,6 +4474,26 @@ test_return_t regression_bug_490486(memcached_st *original_memc)
   return TEST_SUCCESS;
 }
 
+test_return_t regression_1021819_TEST(memcached_st *original)
+{
+  memcached_st *memc= memcached_clone(NULL, original);
+  test_true(memc);
+
+  test_compare(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 2000000), MEMCACHED_SUCCESS);
+
+  memcached_return_t rc;
+
+  memcached_get(memc,
+                test_literal_param(__func__),
+                NULL, NULL, &rc);
+
+  test_compare(rc, MEMCACHED_NOTFOUND);
+
+  memcached_free(memc);
+
+  return TEST_SUCCESS;
+}
+
 test_return_t regression_bug_583031(memcached_st *)
 {
   memcached_st *memc= memcached_create(NULL);

diff --git a/tests/libmemcached-1.0/mem_functions.h b/tests/libmemcached-1.0/mem_functions.h
index 571c1607fd20019e6e0ffc9ff80001926cd10379..5d433aa5b06197d9b1453f5a31bf23be505f6fc4 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.h
+++ b/tests/libmemcached-1.0/mem_functions.h
@@ -121,20 +121,21 @@ test_return_t libmemcached_util_ping_TEST(memcached_st*);
 test_return_t prepend_test(memcached_st *memc);
 test_return_t quit_test(memcached_st *memc);
 test_return_t read_through(memcached_st *memc);
-test_return_t regression_bug_(memcached_st *memc);
-test_return_t regression_bug_421108(memcached_st *memc);
-test_return_t regression_bug_434484(memcached_st *memc);
-test_return_t regression_bug_434843(memcached_st *original_memc);
-test_return_t regression_bug_434843_buffered(memcached_st *memc);
-test_return_t regression_bug_442914(memcached_st *memc);
-test_return_t regression_bug_447342(memcached_st *memc);
-test_return_t regression_bug_463297(memcached_st *memc);
-test_return_t regression_bug_490486(memcached_st *original_memc);
-test_return_t regression_bug_490520(memcached_st *memc);
-test_return_t regression_bug_581030(memcached_st *);
-test_return_t regression_bug_583031(memcached_st *);
-test_return_t regression_bug_655423(memcached_st *memc);
-test_return_t regression_bug_854604(memcached_st *);
+test_return_t regression_bug_(memcached_st*);
+test_return_t regression_bug_421108(memcached_st*);
+test_return_t regression_bug_434484(memcached_st*);
+test_return_t regression_bug_434843(memcached_st*);
+test_return_t regression_bug_434843_buffered(memcached_st*);
+test_return_t regression_bug_442914(memcached_st*);
+test_return_t regression_bug_447342(memcached_st*);
+test_return_t regression_bug_463297(memcached_st*);
+test_return_t regression_bug_490486(memcached_st*);
+test_return_t regression_bug_490520(memcached_st*);
+test_return_t regression_bug_581030(memcached_st*);
+test_return_t regression_bug_583031(memcached_st*);
+test_return_t regression_1021819_TEST(memcached_st*);
+test_return_t regression_bug_655423(memcached_st*);
+test_return_t regression_bug_854604(memcached_st*);
 test_return_t replace_test(memcached_st *memc);
 test_return_t result_alloc(memcached_st *memc);
 test_return_t result_static(memcached_st *memc);