projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix all include location, and drop versions of the library that were never shipped.
[awesomized/libmemcached]
/
example
/
t
/
memcached_light.cc
diff --git
a/example/t/memcached_light.cc
b/example/t/memcached_light.cc
index e24d31c2350cdd47b6018eaf709aa5d0d869f780..c5956b24c3840ab3e0b096de18178f018a195dc5 100644
(file)
--- a/
example/t/memcached_light.cc
+++ b/
example/t/memcached_light.cc
@@
-42,7
+42,7
@@
#include <config.h>
#include <libtest/test.hpp>
#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"
#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)
{
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;
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;
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);
}
world->set_runner(new MemcachedLightRunner);
}