projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for return
[awesomized/libmemcached]
/
tests
/
memrm.cc
diff --git
a/tests/memrm.cc
b/tests/memrm.cc
index bf2dc86a9235ca0902d121dcf914fd3334294b08..382693cd8a90e1290472926069241170c8b8de67 100644
(file)
--- a/
tests/memrm.cc
+++ b/
tests/memrm.cc
@@
-56,15
+56,16
@@
static test_return_t quiet_test(void *)
{
const char *args[]= { "--quiet", 0 };
{
const char *args[]= { "--quiet", 0 };
- test_
true(exec_cmdline(executable, args
));
+ test_
compare(EXIT_FAILURE, exec_cmdline(executable, args, true
));
return TEST_SUCCESS;
}
static test_return_t help_test(void *)
{
return TEST_SUCCESS;
}
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
+73,6
@@
static test_return_t rm_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, "foo", 0 };
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
@@
-84,7
+84,8
@@
static test_return_t rm_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));
+ const char *args[]= { buffer, "foo", 0 };
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_NOTFOUND, rc);
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_NOTFOUND, rc);
@@
-98,7
+99,7
@@
static test_return_t NOT_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, "foo", 0 };
+ const char *args[]= { buffer, "foo", 0 };
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
memcached_st *memc= memcached(buffer, strlen(buffer));
test_true(memc);
@@
-107,7
+108,7
@@
static test_return_t NOT_FOUND_test(void *)
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_NOTFOUND, rc);
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_NOTFOUND, rc);
- test_
true(exec_cmdline(executable, args
));
+ test_
compare(EXIT_SUCCESS, exec_cmdline(executable, args, true
));
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_NOTFOUND, rc);
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_NOTFOUND, rc);
@@
-134,7
+135,7
@@
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;
}