- if (HAVE_MEMCACHED_BINARY == 0)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
-
- const char *argv[1]= { "memcapable" };
- if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
- {
- error= TEST_FAILURE;
- }
+ SKIP_UNLESS(libtest::has_memcached());
+
+ SKIP_UNLESS(server_startup(servers, "memcached", libtest::default_port(), NULL));