Merge with 1.0 trunk.

17 files changed, 29 insertions, 51 deletions

diff --git a/tests/cycle.cc b/tests/cycle.cc
index 3865eeb5..41a12d97 100644
--- a/tests/cycle.cc
+++ b/tests/cycle.cc
@@ -48,7 +48,7 @@ using namespace libtest;
 static test_return_t server_startup_single_TEST(void *obj)
 {
   server_startup_st *servers= (server_startup_st*)obj;
-  test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), 0, NULL, false));
+  test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), NULL));
   test_compare(true, servers->shutdown());
 
 
@@ -60,9 +60,9 @@ static test_return_t server_startup_multiple_TEST(void *obj)
   test_skip(true, jenkins_is_caller());
 
   server_startup_st *servers= (server_startup_st*)obj;
-  for (size_t x= 0; x < 10; x++)
+  for (size_t x= 0; x < 10; ++x)
   {
-    test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), 0, NULL, false));
+    test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), NULL));
   }
   test_compare(true, servers->shutdown());
 
diff --git a/tests/failure.cc b/tests/failure.cc
index 1b54b74e..b039603a 100644
--- a/tests/failure.cc
+++ b/tests/failure.cc
@@ -84,7 +84,7 @@ static test_return_t add_shutdown_servers(memcached_st *memc)
   while (memcached_server_count(memc) < 2)
   {
     const char *argv[1]= { "add_shutdown_server" };
-    test_true(global_framework->servers().start_socket_server("memcached", libtest::default_port(), 1, argv));
+    test_true(global_framework->servers().start_socket_server("memcached", libtest::default_port(), argv));
     test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", libtest::default_port()));
   }
 
diff --git a/tests/include.am b/tests/include.am
index 0ac1d898..44fdbfa3 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -58,7 +58,6 @@ test-failure: tests/failure
 gdb-failure: tests/failure
 	@$(GDB_COMMAND) tests/failure
 
-
 tests_testhashkit_SOURCES= tests/hashkit_functions.cc
 tests_testhashkit_LDADD= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testhashkit
diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index 83b56c21..91e75372 100644
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -39,7 +39,7 @@
 #include <libtest/test.hpp>
 
 #if defined(HAVE_LIBUUID) && HAVE_LIBUUID
-#include <uuid/uuid.h>
+# include <uuid/uuid.h>
 #endif
 
 /*
@@ -4606,7 +4606,7 @@ test_return_t regression_bug_583031(memcached_st *)
   test_true(memc);
   test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "10.2.3.4", 11211));
 
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, 1000);
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, 3000);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 1000);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000);
@@ -4621,7 +4621,7 @@ test_return_t regression_bug_583031(memcached_st *)
   test_false(value);
   test_zero(length);
 
-  test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc));
+  test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_error(memc));
 
   memcached_free(memc);
 
diff --git a/tests/libmemcached-1.0/pool.cc b/tests/libmemcached-1.0/pool.cc
index 7e484bd3..ced14bbc 100644
--- a/tests/libmemcached-1.0/pool.cc
+++ b/tests/libmemcached-1.0/pool.cc
@@ -243,10 +243,7 @@ struct test_pool_context_st {
 static __attribute__((noreturn)) void* connection_release(void *arg)
 {
   test_pool_context_st *resource= static_cast<test_pool_context_st *>(arg);
-  if (resource == NULL)
-  {
-    fatal_message("resource == NULL");
-  }
+  FATAL_IF(resource == NULL);
 
   // Release all of the memc we are holding 
   resource->rc= memcached_pool_release(resource->pool, resource->mmc);
@@ -396,17 +393,11 @@ static bool _running= false;
 static void set_running(const bool arg)
 {
   int error;
-  if ((error= pthread_mutex_lock(&mutex)) != 0)
-  {
-    fatal_message(strerror(error));
-  }
+  FATAL_IF_((error= pthread_mutex_lock(&mutex)) != 0, strerror(error));
 
   _running= arg;
 
-  if ((error= pthread_mutex_unlock(&mutex)) != 0)
-  {
-    fatal_message(strerror(error));
-  }
+  FATAL_IF_((error= pthread_mutex_unlock(&mutex)) != 0, strerror(error));
 }
 
 static bool running()
@@ -414,17 +405,11 @@ static bool running()
   int error;
   bool ret;
   
-  if ((error= pthread_mutex_lock(&mutex)) != 0)
-  {
-    fatal_message(strerror(error));
-  }
+  FATAL_IF_((error= pthread_mutex_lock(&mutex)) != 0, strerror(error));
 
   ret= _running;
 
-  if ((error= pthread_mutex_unlock(&mutex)) != 0)
-  {
-    fatal_message(strerror(error));
-  }
+  FATAL_IF_((error= pthread_mutex_unlock(&mutex)) != 0, strerror(error));
 
   return ret;
 }
@@ -504,15 +489,9 @@ test_return_t regression_bug_962815(memcached_st *memc)
     test_compare(0, pthread_join(pid[x], NULL));
   }
 
-  if (pool)
-  {
-    memcached_pool_destroy(pool);
-  }
+  memcached_pool_destroy(pool);
 
-  if (master)
-  {
-    memcached_free(master);
-  }
+  memcached_free(master);
 
   return TEST_SUCCESS;
 }
diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 596ec8ee..3dda2d8a 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -77,7 +77,7 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
 
     if (servers.sasl())
     {
-      if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
+      if (server_startup(servers, "memcached-sasl", port, NULL) == false)
       {
         error= TEST_SKIPPED;
         return NULL;
@@ -85,7 +85,7 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     }
     else
     {
-      if (server_startup(servers, "memcached", port, 0, NULL) == false)
+      if (server_startup(servers, "memcached", port, NULL) == false)
       {
         error= TEST_SKIPPED;
         return NULL;
diff --git a/tests/libmemcached_world_socket.h b/tests/libmemcached_world_socket.h
index a3078e76..64cf55e5 100644
--- a/tests/libmemcached_world_socket.h
+++ b/tests/libmemcached_world_socket.h
@@ -53,8 +53,8 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
 
   for (uint32_t x= 0; x < servers.servers_to_run(); x++)
   {
-    const char *argv[1]= { "memcached" };
-    if (servers.start_socket_server("memcached", libtest::get_free_port(), 1, argv) == false)
+    const char *argv[]= { "memcached", 0 };
+    if (servers.start_socket_server("memcached", libtest::get_free_port(), argv) == false)
     {
 #if 0
       fatal_message("Could not launch memcached");
diff --git a/tests/memcapable.cc b/tests/memcapable.cc
index 795fb6f8..054342c3 100644
--- a/tests/memcapable.cc
+++ b/tests/memcapable.cc
@@ -113,7 +113,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_SKIPPED;
   }
diff --git a/tests/memcat.cc b/tests/memcat.cc
index 6664bf66..e019bc9b 100644
--- a/tests/memcat.cc
+++ b/tests/memcat.cc
@@ -132,7 +132,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (not server_startup(servers, "memcached", libtest::default_port(), 0, NULL))
+  if (not server_startup(servers, "memcached", libtest::default_port(), NULL))
   {
     error= TEST_FAILURE;
   }
diff --git a/tests/memcp.cc b/tests/memcp.cc
index 64f17847..9c9f4d62 100644
--- a/tests/memcp.cc
+++ b/tests/memcp.cc
@@ -91,7 +91,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_FAILURE;
   }
diff --git a/tests/memdump.cc b/tests/memdump.cc
index 0d04ea28..e55b2b99 100644
--- a/tests/memdump.cc
+++ b/tests/memdump.cc
@@ -118,7 +118,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_FAILURE;
     return NULL;
diff --git a/tests/memexist.cc b/tests/memexist.cc
index b2db6e53..98d224f7 100644
--- a/tests/memexist.cc
+++ b/tests/memexist.cc
@@ -149,7 +149,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_SKIPPED;
   }
diff --git a/tests/memflush.cc b/tests/memflush.cc
index f3d9c6f9..ca49e711 100644
--- a/tests/memflush.cc
+++ b/tests/memflush.cc
@@ -101,7 +101,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == 0)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == 0)
   {
     error= TEST_SKIPPED;
   }
diff --git a/tests/memrm.cc b/tests/memrm.cc
index 798dd56a..acd24fc0 100644
--- a/tests/memrm.cc
+++ b/tests/memrm.cc
@@ -152,7 +152,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_FAILURE;
   }
diff --git a/tests/memslap.cc b/tests/memslap.cc
index 9dfeca8d..6bf080f3 100644
--- a/tests/memslap.cc
+++ b/tests/memslap.cc
@@ -173,8 +173,8 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  const char *argv[1]= { "memslap" };
-  if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
+  const char *argv[]= { "memslap", 0 };
+  if (server_startup(servers, "memcached", libtest::default_port(), argv) == false)
   {
     error= TEST_FAILURE;
   }
diff --git a/tests/memstat.cc b/tests/memstat.cc
index 2607afdf..3ff97717 100644
--- a/tests/memstat.cc
+++ b/tests/memstat.cc
@@ -113,7 +113,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_SKIPPED;
   }
diff --git a/tests/memtouch.cc b/tests/memtouch.cc
index 9d55d8c0..247e1870 100644
--- a/tests/memtouch.cc
+++ b/tests/memtouch.cc
@@ -145,7 +145,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_SKIPPED;
   }