X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemrm.cc;h=58da088c5d395cde9d662aba88b0feb3717d4581;hb=dbb1511b2cb2e89ab09278e8c624c5050e3ff93d;hp=e422a19d3df1249f62559f08236b2c17051fb1cd;hpb=357b107e59d9918a0f3bdd7e4aad9493c70e03f1;p=awesomized%2Flibmemcached

diff --git a/tests/memrm.cc b/tests/memrm.cc
index e422a19d..58da088c 100644
--- a/tests/memrm.cc
+++ b/tests/memrm.cc
@@ -50,7 +50,7 @@ using namespace libtest;
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif
 
-static std::string executable;
+static std::string executable("./clients/memrm");
 
 static test_return_t quiet_test(void *)
 {
@@ -146,14 +146,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]= { "memrm" };
-  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;
   }
@@ -162,10 +161,9 @@ 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/memrm";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }