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()) and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0)))
+ if (servers.sasl())
{
- error= TEST_SKIPPED;
- return NULL;
- }
+ SKIP_UNLESS(libtest::has_libmemcached_sasl());
- // Assume we are running under valgrind, and bail
- if (servers.sasl() and getenv("TESTS_ENVIRONMENT"))
- {
- 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++)
if (servers.sasl())
{
- if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
+ if (server_startup(servers, "memcached-sasl", port, 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)
+ if (server_startup(servers, "memcached", port, NULL) == false)
{
error= TEST_SKIPPED;
-#if 0
- fatal_message("Could not start memcached");
-#endif
return NULL;
}
}