X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemflush.cc;h=06b38ea5219e2332e87da19ce2d35ff9a6eb8517;hb=5bb6f975322d3da0caf082b8d890132194d0a4ea;hp=d1184722c64f4749e4ba0ab001f653d9f4e67247;hpb=a2d3699da26720a399bd7f563ccdbccf26e610c5;p=awesomized%2Flibmemcached

diff --git a/tests/memflush.cc b/tests/memflush.cc
index d1184722..06b38ea5 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 "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
@@ -95,26 +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;
   }
 
-  const char *argv[1]= { "memflush" };
-  if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
+  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;
+  executable= "./src/bin/memflush";
+  world->collections(collection);
+  world->create(world_create);
 }