X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flibmemcached_world.h;h=596ec8eea60fece04520d19ab8738032e1304106;hb=14ed08eb76405aed0747568326058ab57c5e69a2;hp=88329db4a85f595edf4fd083fbedd18ce1f25cc4;hpb=687c311bc11a24b61c15eb9f5c081a97e8501df0;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 88329db4..596ec8ee 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -43,23 +43,32 @@
 
 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())
   {
-    error= TEST_SKIPPED;
-    return NULL;
-  }
+    if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+    {
+      error= TEST_SKIPPED;
+      return NULL;
+    }
 
-  // Assume we are running under valgrind, and bail
-  if (servers.sasl() and getenv("TESTS_ENVIRONMENT"))
-  {
-    error= TEST_SKIPPED;
-    return NULL;
+    if (HAVE_MEMCACHED_SASL_BINARY == 0)
+    {
+      error= TEST_SKIPPED;
+      return NULL;
+    }
+    
+    // Assume we are running under valgrind, and bail
+    if (getenv("TESTS_ENVIRONMENT"))
+    {
+      error= TEST_SKIPPED;
+      return NULL;
+    }
   }
 
   for (uint32_t x= 0; x < servers.servers_to_run(); x++)
@@ -70,14 +79,16 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     {
       if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
       {
-        fatal_message("Could not start memcached-sasl");
+        error= TEST_SKIPPED;
+        return NULL;
       }
     }
     else
     {
       if (server_startup(servers, "memcached", port, 0, NULL) == false)
       {
-        fatal_message("Could not start memcached");
+        error= TEST_SKIPPED;
+        return NULL;
       }
     }
   }