X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemcapable.cc;h=60fd00ada4820c0d68080279439a30045cfa11c0;hb=2674b74b067e8578bf323445a88f46bb3fa18ffd;hp=f2e347dd69a382c0121a3395b0d663a4aa48c100;hpb=91e92172731fe8a37e562a165d25a312569aff44;p=awesomized%2Flibmemcached

diff --git a/tests/memcapable.cc b/tests/memcapable.cc
index f2e347dd..60fd00ad 100644
--- a/tests/memcapable.cc
+++ b/tests/memcapable.cc
@@ -52,13 +52,19 @@ using namespace libtest;
 
 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 *)
 {
-  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_success(exec_cmdline(executable, args));
+  test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
@@ -66,9 +72,9 @@ static test_return_t ascii_test(void *)
 {
   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_success(exec_cmdline(executable, args));
+  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()));
-  const char *args[]= { buffer, " -b ", 0 };
+  const char *args[]= { "-q", buffer, " -b ", 0 };
 
-  test_success(exec_cmdline(executable, args));
+  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},
@@ -96,6 +103,12 @@ collection_st collection[] ={
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
+  if (HAVE_MEMCACHED_BINARY == 0)
+  {
+    error= TEST_FATAL;
+    return NULL;
+  }
+
   const char *argv[1]= { "memcapable" };
   if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
   {