projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Catch up Gearman's libtest, and fix valgrind warning from new test case.
[m6w6/libmemcached]
/
tests
/
memrm.cc
diff --git
a/tests/memrm.cc
b/tests/memrm.cc
index e422a19d3df1249f62559f08236b2c17051fb1cd..29c663376a33f63d2e6102a4c770bc018874d707 100644
(file)
--- a/
tests/memrm.cc
+++ b/
tests/memrm.cc
@@
-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 *)
{
@@
-152,8
+152,7
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
return NULL;
}
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(), 0, NULL) == false)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-164,8
+163,7
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
void get_world(Framework *world)
{
void get_world(Framework *world)
{
- executable= "./clients/memrm";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}
}