projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for release.
[awesomized/libmemcached]
/
tests
/
memrm.cc
diff --git
a/tests/memrm.cc
b/tests/memrm.cc
index e422a19d3df1249f62559f08236b2c17051fb1cd..043e0ce50ef2a2d685efd03925765ad81d16b783 100644
(file)
--- a/
tests/memrm.cc
+++ b/
tests/memrm.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;
@@
-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;
+static std::string executable
("./clients/memrm")
;
static test_return_t quiet_test(void *)
{
static test_return_t quiet_test(void *)
{
@@
-146,14
+146,13
@@
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]= { "memrm" };
- if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-162,10
+161,9
@@
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/memrm";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}
}