X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemrm.cc;h=6b2b061851cab6a9c408c1a64e9a1b832af07953;hb=a81ced7911d1c31812d7acfbf0680ba00143ac9c;hp=8d6109c0ac679084e66662df942d57ce4bd20929;hpb=e268471e4642c16281dc65b2f0ad9b897786c0b4;p=awesomized%2Flibmemcached

diff --git a/tests/memrm.cc b/tests/memrm.cc
index 8d6109c0..6b2b0618 100644
--- a/tests/memrm.cc
+++ b/tests/memrm.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;
 
@@ -146,7 +146,7 @@ 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;
@@ -161,9 +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)
 {
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }