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

[awesomized/libmemcached] / tests / memcat.cc

diff --git a/tests/memcat.cc b/tests/memcat.cc
index e51cdce1451e235e944b626a97cc269cd9d8dc0e..d86213c03a43b6ee2af9e0cc778493f372f22481 100644 (file)
--- a/tests/memcat.cc
+++ b/tests/memcat.cc
@@ -126,7 +126,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;
@@ -141,9 +141,9 @@ 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;
+  world->collections(collection);
+  world->create(world_create);
 }