X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flibmemcached_world_socket.h;h=69f0a91bced921b7df3a9433769f9ecc99096f3a;hb=95474a1687017de0adb2c6ce57c1ab7c0704c5c6;hp=fbfb5a9cd14a2353135646fbc9bea47f8a649316;hpb=e9c7a25491f4cf9265a926b7d9848bd70acaf7aa;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached_world_socket.h b/tests/libmemcached_world_socket.h
index fbfb5a9c..69f0a91b 100644
--- a/tests/libmemcached_world_socket.h
+++ b/tests/libmemcached_world_socket.h
@@ -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;
     }
   }
 
@@ -71,11 +75,14 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
 static bool world_destroy(void *object)
 {
   libmemcached_test_container_st *container= (libmemcached_test_container_st *)object;
+
+#if 0
 #if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT
   if (LIBMEMCACHED_WITH_SASL_SUPPORT)
   {
     sasl_done();
   }
+#endif
 #endif
 
   delete container;