X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemflush.cc;h=3a3ac076d2fb4574813a38561886b44ff7d5b033;hb=aaafc64fc6b893f50861a53f7e7a8c735827bf49;hp=80a42453068e8fb35092b97c55f41fd1488c4d16;hpb=cf55f693c7fc7693afbb4594d97d23795cf7f2a0;p=m6w6%2Flibmemcached

diff --git a/tests/memflush.cc b/tests/memflush.cc
index 80a42453..3a3ac076 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,7 +95,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;
@@ -103,14 +103,14 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 
   if (server_startup(servers, "memcached", libtest::default_port(), 0, 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);