X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemflush.cc;h=c197b4903956c8ada4969e9c0229e68145af0c3d;hb=1be11f8bb8fdf368985d9e1c900b250541dc4791;hp=f14b5b727d884f6171d44b89920fd8f4b0cf6abc;hpb=7773f76bd15be71f7d1a5579006b786584d3fe26;p=awesomized%2Flibmemcached

diff --git a/tests/memflush.cc b/tests/memflush.cc
index f14b5b72..c197b490 100644
--- a/tests/memflush.cc
+++ b/tests/memflush.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;
 
@@ -95,25 +95,25 @@ 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) == 0)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == 0)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
   }
 
   return &servers;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   executable= "./clients/memflush";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }