projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update RPM
[m6w6/libmemcached]
/
tests
/
memslap.cc
diff --git
a/tests/memslap.cc
b/tests/memslap.cc
index f353978d2305a02ba7c87b32bb0a23aecffe47a2..57b7c3554ef3a00bd4019dc9cf8ae88c1cb20905 100644
(file)
--- a/
tests/memslap.cc
+++ b/
tests/memslap.cc
@@
-167,14
+167,14
@@
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;
}
const char *argv[1]= { "memslap" };
{
error= TEST_SKIPPED;
return NULL;
}
const char *argv[1]= { "memslap" };
- if (not server_startup(servers, "memcached",
MEMCACHED_DEFAULT_PORT +10
, 1, argv))
+ if (not server_startup(servers, "memcached",
libtest::default_port()
, 1, argv))
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-186,7
+186,7
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
void get_world(Framework *world)
{
executable= "./clients/memslap";
void get_world(Framework *world)
{
executable= "./clients/memslap";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}