projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: fix skip condition for CAS test
[awesomized/libmemcached]
/
tests
/
memslap.cc
diff --git
a/tests/memslap.cc
b/tests/memslap.cc
index 55c89111acd79f5f9ddaf0ed0c26da8709a6ae55..8a1a5cba74a23c5f468284ecede35f9ac1c1a32c 100644
(file)
--- a/
tests/memslap.cc
+++ b/
tests/memslap.cc
@@
-39,10
+39,10
@@
Test that we are cycling the servers we are creating during testing.
*/
Test that we are cycling the servers we are creating during testing.
*/
-#include <config.h>
+#include <
mem_
config.h>
#include <libtest/test.hpp>
#include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached
-1.0
/memcached.h>
using namespace libtest;
using namespace libtest;
@@
-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;
}
{
error= TEST_SKIPPED;
return NULL;
}
- const char *argv[
1]= { "memslap"
};
- if (
not server_startup(servers, "memcached", libtest::get_free_port(), 1, argv)
)
+ const char *argv[
]= { "memslap", 0
};
+ if (
server_startup(servers, "memcached", libtest::default_port(), argv) == false
)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-183,10
+183,10
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
}
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
executable= "./clients/memslap";
{
executable= "./clients/memslap";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}