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

[awesomized/libmemcached] / tests / memslap.cc

diff --git a/tests/memslap.cc b/tests/memslap.cc
index 6f990af498d9c81d7bfa79c5c9e878e334c482f2..792d15fbcfb9b0de5cb46a73e7b659b019ab0c0c 100644 (file)
--- a/tests/memslap.cc
+++ b/tests/memslap.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;
 
@@ -167,7 +167,7 @@ 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;
@@ -183,10 +183,10 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   executable= "./clients/memslap";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }