X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemstat.cc;h=7bbab3633cc00ba8a1bc1bfdc5bcdbf05be3bde0;hb=8c44ea2a34b6cedf545fd07a568bddad74e9b69e;hp=ae8679fb13d47bc30fd8f63336e9b7cdd8ede2ee;hpb=e268471e4642c16281dc65b2f0ad9b897786c0b4;p=awesomized%2Flibmemcached

diff --git a/tests/memstat.cc b/tests/memstat.cc
index ae8679fb..7bbab363 100644
--- a/tests/memstat.cc
+++ b/tests/memstat.cc
@@ -39,10 +39,10 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
@@ -107,24 +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;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), 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);
 }