X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemexist.cc;h=e3a57c5c5970d48bf99118dbb0d9e05138075d12;hb=6cca0302addd6ea9714f2b8deff2c48aab3002ef;hp=a0fec9e02e24647272f80bc2e2113547bf47765c;hpb=7773f76bd15be71f7d1a5579006b786584d3fe26;p=awesomized%2Flibmemcached

diff --git a/tests/memexist.cc b/tests/memexist.cc
index a0fec9e0..e3a57c5c 100644
--- a/tests/memexist.cc
+++ b/tests/memexist.cc
@@ -43,6 +43,7 @@
 
 #include <libtest/test.hpp>
 #include <libmemcached/memcached.h>
+#include <libmemcached/util.h>
 
 using namespace libtest;
 
@@ -111,6 +112,23 @@ static test_return_t NOT_FOUND_test(void *)
   return TEST_SUCCESS;
 }
 
+static test_return_t check_version(void*)
+{
+  char buffer[1024];
+  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  memcached_st *memc= memcached(buffer, strlen(buffer));
+  test_true(memc);
+  
+  test_return_t result= TEST_SUCCESS;
+  if (libmemcached_util_version_check(memc, 1, 4, 8) == false)
+  {
+    result= TEST_SKIPPED;
+  }
+  memcached_free(memc);
+
+  return result;
+}
+
 test_st memexist_tests[] ={
   {"--help", true, help_test },
   {"exist(FOUND)", true, exist_test },
@@ -119,13 +137,13 @@ test_st memexist_tests[] ={
 };
 
 collection_st collection[] ={
-  {"memexist", 0, 0, memexist_tests },
+  {"memexist", check_version, 0, memexist_tests },
   {0, 0, 0, 0}
 };
 
 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;
@@ -133,16 +151,16 @@ 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;
+  world->collections(collection);
+  world->create(world_create);
 }