X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=example%2Ft%2Fmemcached_light.cc;h=c5956b24c3840ab3e0b096de18178f018a195dc5;hb=2569efffe16042f47dc5d2c34528a9ec22fc18b0;hp=bcfce0a52a19e3bdc350fe28ad64c9c562698510;hpb=93dec285cdb4aab2bff0bae0d50e033b69560181;p=awesomized%2Flibmemcached

diff --git a/example/t/memcached_light.cc b/example/t/memcached_light.cc
index bcfce0a5..c5956b24 100644
--- a/example/t/memcached_light.cc
+++ b/example/t/memcached_light.cc
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "tests/libmemcached-1.0/memcached_get.h"
 
@@ -166,8 +166,6 @@ public:
   }
 };
 
-static MemcachedLightRunner defualt_libmemcached_runner;
-
 test_st cmdline_option_TESTS[] ={
   {"--help", true, help_TEST },
   {"--verbose", true, verbose_TEST },
@@ -201,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;
@@ -210,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;
   }
 
 
@@ -233,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->set_runner(&defualt_libmemcached_runner);
+  world->create(world_create);
+  world->destroy(world_destroy);
+  world->collections(collection);
+  world->set_runner(new MemcachedLightRunner);
 }