X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemslap.cc;h=8a1a5cba74a23c5f468284ecede35f9ac1c1a32c;hb=a83eb6704af40530cf38935cb30dd576af563e61;hp=f353978d2305a02ba7c87b32bb0a23aecffe47a2;hpb=70d0d339d06cbe6b35ef0efc4fd3d7e8f92b6a01;p=awesomized%2Flibmemcached

diff --git a/tests/memslap.cc b/tests/memslap.cc
index f353978d..8a1a5cba 100644
--- a/tests/memslap.cc
+++ b/tests/memslap.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;
 
@@ -167,14 +167,14 @@ 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]= { "memslap" };
-  if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+  const char *argv[]= { "memslap", 0 };
+  if (server_startup(servers, "memcached", libtest::default_port(), argv) == false)
   {
     error= TEST_FAILURE;
   }
@@ -183,10 +183,10 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   executable= "./clients/memslap";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }