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

[awesomized/libmemcached] / tests / memexist.cc

diff --git a/tests/memexist.cc b/tests/memexist.cc
index fb69354dac4975694db3182940c1042804425130..e3a57c5c5970d48bf99118dbb0d9e05138075d12 100644 (file)
--- a/tests/memexist.cc
+++ b/tests/memexist.cc
@@ -143,7 +143,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;
@@ -151,14 +151,14 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 
   if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
   }
 
   return &servers;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->collections(collection);
   world->create(world_create);