X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemerror.cc;h=9b3ddd353ab9236d9097e8c12a700e6c10b9d35a;hb=2569efffe16042f47dc5d2c34528a9ec22fc18b0;hp=dd7610ef625cb9be3a23cbb47742fa959f21535d;hpb=23bbe3972dada1e21493437ba64be129e86b59fc;p=awesomized%2Flibmemcached

diff --git a/tests/memerror.cc b/tests/memerror.cc
index dd7610ef..9b3ddd35 100644
--- a/tests/memerror.cc
+++ b/tests/memerror.cc
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
@@ -111,13 +111,19 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-static void *world_create(server_startup_st&, test_return_t&)
+static void *world_create(server_startup_st&, test_return_t& error)
 {
+  if (libtest::has_memcached() == false)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
   return NULL;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->collections(collection);
   world->create(world_create);