Update to support new warnings.

[m6w6/libmemcached] / tests / memstat.cc

diff --git a/tests/memstat.cc b/tests/memstat.cc
index 6bb8c053bd5f685f64446f7b99a4993c63314312..9b8cb836a380593ab9f266c35752dfac18b55f1f 100644 (file)
--- a/tests/memstat.cc
+++ b/tests/memstat.cc
@@ -107,25 +107,24 @@ 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]= { "memstat" };
-  if (server_startup(servers, "memcached", libtest::default_port(), 1, argv) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
   }
 
   return &servers;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }