projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Set SASL errors correctly.
[m6w6/libmemcached]
/
tests
/
memcapable.cc
diff --git
a/tests/memcapable.cc
b/tests/memcapable.cc
index 75b93995e6e99214998d9d2b73f3fb1fbe51adc3..2723e7f656783bd52dca18b4ef6d02eaf09edfa3 100644
(file)
--- a/
tests/memcapable.cc
+++ b/
tests/memcapable.cc
@@
-107,14
+107,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]= { "memcapable" };
- if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-126,7
+125,7
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
void get_world(Framework *world)
{
executable= "./clients/memcapable";
void get_world(Framework *world)
{
executable= "./clients/memcapable";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}