X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemcapable.cc;h=2723e7f656783bd52dca18b4ef6d02eaf09edfa3;hb=e9c7a25491f4cf9265a926b7d9848bd70acaf7aa;hp=75b93995e6e99214998d9d2b73f3fb1fbe51adc3;hpb=a2d3699da26720a399bd7f563ccdbccf26e610c5;p=m6w6%2Flibmemcached

diff --git a/tests/memcapable.cc b/tests/memcapable.cc
index 75b93995..2723e7f6 100644
--- a/tests/memcapable.cc
+++ b/tests/memcapable.cc
@@ -107,14 +107,13 @@ collection_st collection[] ={
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
-  if (HAVE_MEMCACHED_BINARY == 0)
+  if (libtest::has_memcached() == false)
   {
     error= TEST_SKIPPED;
     return NULL;
   }
 
-  const char *argv[1]= { "memcapable" };
-  if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
+  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
   {
     error= TEST_FAILURE;
   }
@@ -126,7 +125,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 void get_world(Framework *world)
 {
   executable= "./clients/memcapable";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }