projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates from ddm4
[awesomized/libmemcached]
/
tests
/
memflush.cc
diff --git
a/tests/memflush.cc
b/tests/memflush.cc
index f14b5b727d884f6171d44b89920fd8f4b0cf6abc..3ba91459c3ab8fc696ed141c48a45fc63a35859a 100644
(file)
--- a/
tests/memflush.cc
+++ b/
tests/memflush.cc
@@
-95,7
+95,7
@@
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 (
HAVE_MEMCACHED_BINARY == 0
)
+ if (
libtest::has_memcached() == false
)
{
error= TEST_SKIPPED;
return NULL;
{
error= TEST_SKIPPED;
return NULL;
@@
-103,17
+103,17
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == 0)
{
if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == 0)
{
- error= TEST_
FAILURE
;
+ error= TEST_
SKIPPED
;
}
return &servers;
}
}
return &servers;
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
executable= "./clients/memflush";
{
executable= "./clients/memflush";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}