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

[awesomized/libmemcached] / tests / memslap.cc

diff --git a/tests/memslap.cc b/tests/memslap.cc
index 3c5ea25030e2e36af734b6022f0f9a3e077ae4f8..c150082978a0ce971d87372a182748603b7188c2 100644 (file)
--- a/tests/memslap.cc
+++ b/tests/memslap.cc
@@ -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,7 +183,7 @@ 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);