Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-186

[awesomized/libmemcached] / tests / memcp.cc

diff --git a/tests/memcp.cc b/tests/memcp.cc
index 8aba60883cc5d66f39b38b46a3739491aa2a58a5..ef5ef0fa7abe33af80c3410a5bac92153566da59 100644 (file)
--- a/tests/memcp.cc
+++ b/tests/memcp.cc
@@ -39,10 +39,10 @@
   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-1.0/memcached.h>
 
 using namespace libtest;
 
@@ -85,7 +85,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;
@@ -100,7 +100,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->collections(collection);
   world->create(world_create);