X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fmemcapable.cc;h=04a7b34259182ac643b556b452fc0ee3fa31e08c;hb=refs%2Ftags%2F1.0.17;hp=4984818841cb4ed95e4bf3918d967fe931d32e32;hpb=70d0d339d06cbe6b35ef0efc4fd3d7e8f92b6a01;p=awesomized%2Flibmemcached

diff --git a/tests/memcapable.cc b/tests/memcapable.cc
index 49848188..04a7b342 100644
--- a/tests/memcapable.cc
+++ b/tests/memcapable.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;
 
@@ -107,26 +107,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]= { "memcapable" };
-  if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
   }
 
   return &servers;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   executable= "./clients/memcapable";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }