Update for release.

[awesomized/libmemcached] / tests / libmemcached_world_socket.h

diff --git a/tests/libmemcached_world_socket.h b/tests/libmemcached_world_socket.h
index 9ea175e37243f6be521cff1f7b5f4a7f36f60d34..64cf55e5cf5ba0f5d6ecb6c28d76177d322d22e6 100644 (file)
--- a/tests/libmemcached_world_socket.h
+++ b/tests/libmemcached_world_socket.h
@@ -45,7 +45,7 @@
 
 static void *world_create(libtest::server_startup_st& servers, test_return_t& error)
 {
-  if (HAVE_MEMCACHED_BINARY == 0)
+  if (libtest::has_memcached() == false)
   {
     error= TEST_SKIPPED;
     return NULL;
@@ -53,10 +53,14 @@ 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");
+#endif
+      error= TEST_SKIPPED;
+      return NULL;
     }
   }