X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fcycle.cc;h=e18037df3aaabea03f8deae88dc73ea9850ecbe8;hb=2569efffe16042f47dc5d2c34528a9ec22fc18b0;hp=788d7e67bf88bd7ac8eb9d09d89cbc1aa776a8c7;hpb=bce9a74e8addd1085b2e751508bf9ab0c2e84e45;p=awesomized%2Flibmemcached

diff --git a/tests/cycle.cc b/tests/cycle.cc
index 788d7e67..e18037df 100644
--- a/tests/cycle.cc
+++ b/tests/cycle.cc
@@ -43,7 +43,7 @@
 #include <libtest/test.hpp>
 
 using namespace libtest;
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 static test_return_t server_startup_single_TEST(void *obj)
 {
@@ -116,14 +116,20 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-static void *world_create(server_startup_st& servers, test_return_t& )
+static void *world_create(server_startup_st& servers, test_return_t& error)
 {
+  if (libtest::has_memcached() == false)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
   return &servers;
 }
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }