X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=8b3ba64136ddef4c9c39de9522870d805b85f58a;hb=6b83fd5838692b71a50710b9bc13680f9c586167;hp=88329db4a85f595edf4fd083fbedd18ce1f25cc4;hpb=5deca7af238185cfb53be80909b45ed807282b26;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 88329db4..8b3ba641 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -43,13 +43,13 @@
 
 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;
   }
 
-  if (servers.sasl() and (LIBMEMCACHED_WITH_SASL_SUPPORT == 0 or MEMCACHED_SASL_BINARY == 0))
+  if ((servers.sasl()) and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0)))
   {
     error= TEST_SKIPPED;
     return NULL;
@@ -70,14 +70,22 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     {
       if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
       {
+        error= TEST_SKIPPED;
+#if 0
         fatal_message("Could not start memcached-sasl");
+#endif
+        return NULL;
       }
     }
     else
     {
       if (server_startup(servers, "memcached", port, 0, NULL) == false)
       {
+        error= TEST_SKIPPED;
+#if 0
         fatal_message("Could not start memcached");
+#endif
+        return NULL;
       }
     }
   }