projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for version release.
[m6w6/libmemcached]
/
tests
/
memdump.cc
diff --git
a/tests/memdump.cc
b/tests/memdump.cc
index 6e5a2aed8173df1d18e8226e5b875fc9eaaec3aa..a8720e5b272c2fc520285c99dfd51cf910519f0b 100644
(file)
--- a/
tests/memdump.cc
+++ b/
tests/memdump.cc
@@
-50,21
+50,14
@@
using namespace libtest;
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
-static std::string executable;
-
-static test_return_t quiet_test(void *)
-{
- const char *args[]= { "--quiet", 0 };
-
- test_true(exec_cmdline(executable, args));
- return TEST_SUCCESS;
-}
+static std::string executable("./clients/memdump");
static test_return_t help_test(void *)
{
const char *args[]= { "--help", "--quiet", 0 };
static test_return_t help_test(void *)
{
const char *args[]= { "--help", "--quiet", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-74,7
+67,8
@@
static test_return_t server_test(void *)
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, 0 };
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-82,7
+76,7
@@
static test_return_t FOUND_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
- const char *args[]= {
"--quiet",
buffer, 0 };
+ const char *args[]= { buffer, 0 };
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
@@
-97,7
+91,7
@@
static test_return_t FOUND_test(void *)
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_SUCCESS, rc);
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_SUCCESS, rc);
- test_
true(exec_cmdline(executable, args
));
+ test_
compare(EXIT_SUCCESS, exec_cmdline(executable, args, true
));
memcached_free(memc);
memcached_free(memc);
@@
-105,7
+99,6
@@
static test_return_t FOUND_test(void *)
}
test_st memdump_tests[] ={
}
test_st memdump_tests[] ={
- {"--quiet", true, quiet_test },
{"--help", true, help_test },
{"--server", true, server_test },
{"FOUND", true, FOUND_test },
{"--help", true, help_test },
{"--server", true, server_test },
{"FOUND", true, FOUND_test },
@@
-121,12
+114,11
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
{
if (HAVE_MEMCACHED_BINARY == 0)
{
{
if (HAVE_MEMCACHED_BINARY == 0)
{
- error= TEST_
FATAL
;
+ error= TEST_
SKIPPED
;
return NULL;
}
return NULL;
}
- const char *argv[1]= { "memdump" };
- if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-137,8
+129,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/memdump";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}
}