projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix valgrind issues.
[awesomized/libmemcached]
/
tests
/
memtouch.cc
diff --git
a/tests/memtouch.cc
b/tests/memtouch.cc
index 6813eb8deefdce3554eec47c509398222c9cc7ea..a09bd40a0c8a8eaf92dbcf14f45d36f24560ecb8 100644
(file)
--- a/
tests/memtouch.cc
+++ b/
tests/memtouch.cc
@@
-52,19
+52,12
@@
using namespace libtest;
static std::string executable;
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 test_return_t help_test(void *)
{
static test_return_t help_test(void *)
{
- const char *args[]= { "--quiet", "--help", 0 };
+ const char *args[]= { "--help", 0 };
+
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
- test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-72,7
+65,6
@@
static test_return_t touch_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", "--expire=30", buffer, "foo", 0 };
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
@@
-82,7
+74,9
@@
static test_return_t touch_test(void *)
test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
- test_true(exec_cmdline(executable, args));
+ snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+ const char *args[]= { "--expire=30", buffer, "foo", 0 };
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
@@
-94,9
+88,8
@@
static test_return_t touch_test(void *)
static test_return_t NOT_FOUND_test(void *)
{
char buffer[1024];
static test_return_t NOT_FOUND_test(void *)
{
char buffer[1024];
- snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
- const char *args[]= { "--quiet", "--expire=30", buffer, "foo", 0 };
+ snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
@@
-104,7
+97,9
@@
static test_return_t NOT_FOUND_test(void *)
test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
- test_true(exec_cmdline(executable, args));
+ snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+ const char *args[]= { "--expire=30", buffer, "foo", 0 };
+ test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
@@
-114,7
+109,6
@@
static test_return_t NOT_FOUND_test(void *)
}
test_st memtouch_tests[] ={
}
test_st memtouch_tests[] ={
- {"--quiet", true, quiet_test },
{"--help", true, help_test },
{"touch(FOUND)", true, touch_test },
{"touch(NOT_FOUND)", true, NOT_FOUND_test },
{"--help", true, help_test },
{"touch(FOUND)", true, touch_test },
{"touch(NOT_FOUND)", true, NOT_FOUND_test },