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"))
{
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;
return NULL;
}
else
{
- if (server_startup(servers, "memcached", port, 0, NULL) == false)
+ if (server_startup(servers, "memcached", port, NULL) == false)
{
error= TEST_SKIPPED;
return NULL;