projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://10.0.3.21 Build: jenkins-Libmemcached-469
[awesomized/libmemcached]
/
tests
/
memslap.cc
diff --git
a/tests/memslap.cc
b/tests/memslap.cc
index 57b7c3554ef3a00bd4019dc9cf8ae88c1cb20905..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;
@@
-173,8
+173,8
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
return NULL;
}
return NULL;
}
- const char *argv[
1]= { "memslap"
};
- if (
not server_startup(servers, "memcached", libtest::default_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,7
+183,7
@@
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";
world->collections(collection);
{
executable= "./clients/memslap";
world->collections(collection);