X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=example%2Ft%2Fmemcached_light.cc;h=bfb78b9144f5c77d3ef02540a978daaeccb2507c;hb=23dca174eef8d846e3d4402729b57f6ded035e64;hp=e24d31c2350cdd47b6018eaf709aa5d0d869f780;hpb=941deb278c78654f9cfeda6f343c79e2f10b746a;p=awesomized%2Flibmemcached

diff --git a/example/t/memcached_light.cc b/example/t/memcached_light.cc
index e24d31c2..bfb78b91 100644
--- a/example/t/memcached_light.cc
+++ b/example/t/memcached_light.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>
 
 #include "tests/libmemcached-1.0/memcached_get.h"
 
@@ -199,6 +199,12 @@ collection_st collection[] ={
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
+  if (access(executable.c_str(), X_OK) != 0)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
   if (HAVE_MEMCACHED_LIGHT_BINARY == 0)
   {
     error= TEST_SKIPPED;
@@ -208,6 +214,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   if (server_startup(servers, "memcached-light", libtest::default_port(), 0, NULL) == 0)
   {
     error= TEST_FAILURE;
+    return NULL;
   }
 
 
@@ -231,11 +238,11 @@ static bool world_destroy(void *object)
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  world->_create= world_create;
-  world->_destroy= world_destroy;
-  world->collections= collection;
+  world->create(world_create);
+  world->destroy(world_destroy);
+  world->collections(collection);
   world->set_runner(new MemcachedLightRunner);
 }