projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Add Gitter badge
[m6w6/libmemcached]
/
tests
/
memflush.cc
diff --git
a/tests/memflush.cc
b/tests/memflush.cc
index 80a42453068e8fb35092b97c55f41fd1488c4d16..06b38ea5219e2332e87da19ce2d35ff9a6eb8517 100644
(file)
--- a/
tests/memflush.cc
+++ b/
tests/memflush.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/memcached.h>
+#include
"libtest/test.hpp"
+#include
"libmemcached-1.0/memcached.h"
using namespace libtest;
using namespace libtest;
@@
-95,24
+95,24
@@
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;
}
- if (server_startup(servers, "memcached", libtest::default_port(),
0,
NULL) == 0)
+ if (server_startup(servers, "memcached", libtest::default_port(), NULL) == 0)
{
{
- error= TEST_
FAILURE
;
+ error= TEST_
SKIPPED
;
}
return &servers;
}
}
return &servers;
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
{
- executable= "./
clients
/memflush";
+ executable= "./
src/bin
/memflush";
world->collections(collection);
world->create(world_create);
}
world->collections(collection);
world->create(world_create);
}