projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
docs: ws
[m6w6/libmemcached]
/
tests
/
memslap.cc
diff --git
a/tests/memslap.cc
b/tests/memslap.cc
index 792d15fbcfb9b0de5cb46a73e7b659b019ab0c0c..a8fd174767c557f34cf34699656cf09ef55667d8 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
<libmemcached-1.0/memcached.h>
+#include
"libtest/test.hpp"
+#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;
}
@@
-185,7
+185,7
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
void get_world(libtest::Framework* world)
{
void get_world(libtest::Framework* world)
{
- executable= "./
clients
/memslap";
+ executable= "./
src/bin
/memslap";
world->collections(collection);
world->create(world_create);
}
world->collections(collection);
world->create(world_create);
}