X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=6bed25a9624a5458187aa165cdd847e3eeb20083;hb=87ae8c09e17201215808df298a32c6f18311c7ea;hp=3dda2d8ada2a8c78624ed0b1a5601fc90c7ecbfb;hpb=cc7f3ad60dd92d7e41e0efbf922bb4f6fc9a848f;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 3dda2d8a..6bed25a9 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -43,26 +43,12 @@
 
 static void *world_create(libtest::server_startup_st& servers, test_return_t& error)
 {
-  if (libtest::has_memcached() == false)
-  {
-    error= TEST_SKIPPED;
-    return NULL;
-  }
+  SKIP_UNLESS(libtest::has_libmemcached());
 
   if (servers.sasl())
   {
-    if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
-    {
-      error= TEST_SKIPPED;
-      return NULL;
-    }
+    SKIP_UNLESS(libtest::has_libmemcached_sasl());
 
-    if (HAVE_MEMCACHED_SASL_BINARY == 0)
-    {
-      error= TEST_SKIPPED;
-      return NULL;
-    }
-    
     // Assume we are running under valgrind, and bail
     if (getenv("TESTS_ENVIRONMENT"))
     {