X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemtouch.cc;h=5617fa2895683fc5d11143ad2f320af07c08f94f;hb=d413abc63040e03377b85fe4c6545681596d5afc;hp=647485e44e9119964063b5f65f0c97c317479885;hpb=ab130c459a975d24628169901addb191ef2cdf87;p=awesomized%2Flibmemcached

diff --git a/tests/memtouch.cc b/tests/memtouch.cc
index 647485e4..5617fa28 100644
--- a/tests/memtouch.cc
+++ b/tests/memtouch.cc
@@ -39,11 +39,11 @@
   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/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
 
 using namespace libtest;
 
@@ -145,16 +145,16 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  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/memtouch";
   world->collections(collection);