Fix all include location, and drop versions of the library that were never shipped.

[awesomized/libmemcached] / tests / memerror.cc

diff --git a/tests/memerror.cc b/tests/memerror.cc
index 914d2a03b4df6ced19d0196503023c68579e161f..9b3ddd353ab9236d9097e8c12a700e6c10b9d35a 100644 (file)
--- 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,15 +111,21 @@ 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;
+  world->collections(collection);
+  world->create(world_create);
 }