projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update with current fixes.
[m6w6/libmemcached]
/
example
/
t
/
memcached_light.cc
diff --git
a/example/t/memcached_light.cc
b/example/t/memcached_light.cc
index bcfce0a52a19e3bdc350fe28ad64c9c562698510..9158b1425de8dd34c95d164e66015c7eaa58ed3b 100644
(file)
--- a/
example/t/memcached_light.cc
+++ b/
example/t/memcached_light.cc
@@
-166,8
+166,6
@@
public:
}
};
}
};
-static MemcachedLightRunner defualt_libmemcached_runner;
-
test_st cmdline_option_TESTS[] ={
{"--help", true, help_TEST },
{"--verbose", true, verbose_TEST },
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)
{
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;
@@
-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;
if (server_startup(servers, "memcached-light", libtest::default_port(), 0, NULL) == 0)
{
error= TEST_FAILURE;
+ return NULL;
}
}
@@
-235,9
+240,9
@@
static bool world_destroy(void *object)
void get_world(Framework *world)
{
void get_world(Framework *world)
{
- world->
_create= world_create
;
- world->
_destroy= world_destroy
;
- world->collections
= collection
;
- world->set_runner(
&defualt_libmemcached_r
unner);
+ world->
create(world_create)
;
+ world->
destroy(world_destroy)
;
+ world->collections
(collection)
;
+ world->set_runner(
new MemcachedLightR
unner);
}
}