projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Improve tesing of command line apps
[awesomized/libmemcached]
/
tests
/
memcapable.cc
diff --git
a/tests/memcapable.cc
b/tests/memcapable.cc
index 7adf763561a11c134ba5b20119e5553f7049ac47..60fd00ada4820c0d68080279439a30045cfa11c0 100644
(file)
--- a/
tests/memcapable.cc
+++ b/
tests/memcapable.cc
@@
-52,11
+52,17
@@
using namespace libtest;
static std::string executable;
static std::string executable;
+static test_return_t quiet_test(void *)
+{
+ const char *args[]= { "-q", 0 };
+
+ test_true(exec_cmdline(executable, args));
+ return TEST_SUCCESS;
+}
+
static test_return_t help_test(void *)
{
static test_return_t help_test(void *)
{
- char buffer[1024];
- snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
- const char *args[]= { buffer, "--help", 0 };
+ const char *args[]= { "-q", "--help", 0 };
test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
@@
-66,7
+72,7
@@
static test_return_t ascii_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
- const char *args[]= { buffer, " -a ", 0 };
+ const char *args[]= {
"-q",
buffer, " -a ", 0 };
test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
@@
-76,13
+82,14
@@
static test_return_t binary_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
- const char *args[]= { buffer, " -b ", 0 };
+ const char *args[]= {
"-q",
buffer, " -b ", 0 };
test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
test_st memcapable_tests[] ={
test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
test_st memcapable_tests[] ={
+ {"--quiet", 0, quiet_test},
{"--help", 0, help_test},
{"-a, ascii", 0, ascii_test},
{"-b, binary", 0, binary_test},
{"--help", 0, help_test},
{"-a, ascii", 0, ascii_test},
{"-b, binary", 0, binary_test},