X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemflush.cc;h=d8e0b5f800a9552b12b76c4f40e668b8f6711266;hb=6a6fc4a2fe5528d8be1e6ee4405a9ac09d873224;hp=5339f4e26845017bdebea9c12f997e79d8f65c0c;hpb=a18c65b0ee1a4721a4f1298f52f8b3446cf7c600;p=m6w6%2Flibmemcached

diff --git a/tests/memflush.cc b/tests/memflush.cc
index 5339f4e2..d8e0b5f8 100644
--- a/tests/memflush.cc
+++ b/tests/memflush.cc
@@ -95,14 +95,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]= { "memflush" };
-  if (not server_startup(servers, "memcached", libtest::get_free_port(), 1, argv))
+  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == 0)
   {
     error= TEST_FAILURE;
   }
@@ -114,7 +113,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 void get_world(Framework *world)
 {
   executable= "./clients/memflush";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }