projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
First pass through turning instance into ++
[m6w6/libmemcached]
/
tests
/
memflush.cc
diff --git
a/tests/memflush.cc
b/tests/memflush.cc
index 9754470830201e44084bca16b895523e02424bd0..d8e0b5f800a9552b12b76c4f40e668b8f6711266 100644
(file)
--- a/
tests/memflush.cc
+++ b/
tests/memflush.cc
@@
-95,14
+95,13
@@
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;
}
- const char *argv[1]= { "memflush" };
- if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == 0)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-114,7
+113,7
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
void get_world(Framework *world)
{
executable= "./clients/memflush";
void get_world(Framework *world)
{
executable= "./clients/memflush";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}