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
/
memstat.cc
diff --git
a/tests/memstat.cc
b/tests/memstat.cc
index ae8679fb13d47bc30fd8f63336e9b7cdd8ede2ee..516ff7d91b5105305ed3e1132e067e6eead88ad7 100644
(file)
--- a/
tests/memstat.cc
+++ b/
tests/memstat.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;
@@
-50,7
+50,7
@@
using namespace libtest;
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
-static std::string executable("./
clients
/memstat");
+static std::string executable("./
src/bin
/memstat");
static test_return_t help_test(void *)
{
static test_return_t help_test(void *)
{
@@
-107,24
+107,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) == false)
+ if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
{
{
- error= TEST_
FAILURE
;
+ error= TEST_
SKIPPED
;
}
return &servers;
}
}
return &servers;
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
{
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}