X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemslap.cc;h=c150082978a0ce971d87372a182748603b7188c2;hb=728ae479bcecf3530430c4a2e62479ba7586484e;hp=55c89111acd79f5f9ddaf0ed0c26da8709a6ae55;hpb=da8731f513af0fcd2011e244a065f164241bced3;p=m6w6%2Flibmemcached

diff --git a/tests/memslap.cc b/tests/memslap.cc
index 55c89111..c1500829 100644
--- a/tests/memslap.cc
+++ b/tests/memslap.cc
@@ -167,14 +167,14 @@ 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]= { "memslap" };
-  if (not server_startup(servers, "memcached", libtest::get_free_port(), 1, argv))
+  if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
   {
     error= TEST_FAILURE;
   }
@@ -183,10 +183,10 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   executable= "./clients/memslap";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }