Fixes for scanner/parser from OSX.

[awesomized/libmemcached] / tests / libmemcached_world.h

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 5147e1a42a4e0c44acbfc53673b5bcfa8f083d90..596ec8eea60fece04520d19ab8738032e1304106 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -49,17 +49,26 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     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++)
@@ -71,9 +80,6 @@ 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;
       }
     }
@@ -82,9 +88,6 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
       if (server_startup(servers, "memcached", port, 0, NULL) == false)
       {
         error= TEST_SKIPPED;
-#if 0
-        fatal_message("Could not start memcached");
-#endif
         return NULL;
       }
     }