X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Funittest.cc;h=87102ddd7afc8559c4292cc55bf7910fb47be7d4;hb=e0722babba376443e039911f0285ee471e545529;hp=3833a5bd7206bf6f7c69c11b95d25e285fd9cc01;hpb=9835056a5f5240281d13505f1f6fb70085b257b9;p=awesomized%2Flibmemcached

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index 3833a5bd..87102ddd 100644
--- a/libtest/unittest.cc
+++ b/libtest/unittest.cc
@@ -230,13 +230,16 @@ static test_return_t gearmand_cycle_test(void *object)
   server_startup_st *servers= (server_startup_st*)object;
   test_true(servers);
 
-  if (HAVE_LIBGEARMAN and GEARMAND_BINARY)
+  if (GEARMAND_BINARY)
   {
-    test_true(has_gearmand_binary());
-    const char *argv[1]= { "cycle_gearmand" };
-    test_true(server_startup(*servers, "gearmand", 9999, 1, argv));
-
-    return TEST_SUCCESS;
+    if (HAVE_LIBGEARMAN)
+    {
+      test_true(has_gearmand_binary());
+      const char *argv[1]= { "cycle_gearmand" };
+      test_true(server_startup(*servers, "gearmand", 9999, 1, argv));
+
+      return TEST_SUCCESS;
+    }
   }
 
   return TEST_SKIPPED;
@@ -264,13 +267,16 @@ static test_return_t memcached_socket_cycle_test(void *object)
   server_startup_st *servers= (server_startup_st*)object;
   test_true(servers);
 
-  if (MEMCACHED_BINARY and HAVE_LIBMEMCACHED)
+  if (MEMCACHED_BINARY)
   {
-    test_true(has_memcached_binary());
-    const char *argv[1]= { "cycle_memcached" };
-    test_true(servers->start_socket_server("memcached", 9997, 1, argv));
-
-    return TEST_SUCCESS;
+    if (HAVE_LIBMEMCACHED)
+    {
+      test_true(has_memcached_binary());
+      const char *argv[1]= { "cycle_memcached" };
+      test_true(servers->start_socket_server("memcached", 9997, 1, argv));
+
+      return TEST_SUCCESS;
+    }
   }
 
   return TEST_SKIPPED;
@@ -286,18 +292,48 @@ static test_return_t memcached_sasl_test(void *object)
     return TEST_SKIPPED;
   }
 
-  if (MEMCACHED_SASL_BINARY and HAVE_LIBMEMCACHED)
+  if (MEMCACHED_SASL_BINARY)
   {
-    test_true(has_memcached_sasl_binary());
-    const char *argv[1]= { "cycle_memcached_sasl" };
-    test_true(server_startup(*servers, "memcached-sasl", 9996, 1, argv));
-
-    return TEST_SUCCESS;
+    if (HAVE_LIBMEMCACHED)
+    {
+      test_true(has_memcached_sasl_binary());
+      const char *argv[1]= { "cycle_memcached_sasl" };
+      test_true(server_startup(*servers, "memcached-sasl", 9996, 1, argv));
+
+      return TEST_SUCCESS;
+    }
   }
 
   return TEST_SKIPPED;
 }
 
+static test_return_t wait_BINARY(void *)
+{
+  const char *args[]= { "--quiet", 0 };
+
+  test_true(exec_cmdline("libtest/wait", args));
+
+  return TEST_SUCCESS;
+}
+
+static test_return_t wait_help_BINARY(void *)
+{
+  const char *args[]= { "--quiet", "--help", 0 };
+
+  test_true(exec_cmdline("libtest/wait", args));
+
+  return TEST_SUCCESS;
+}
+
+static test_return_t wait_version_BINARY(void *)
+{
+  const char *args[]= { "--quiet", "--version", 0 };
+
+  test_true(exec_cmdline("libtest/wait", args));
+
+  return TEST_SUCCESS;
+}
+
 test_st gearmand_tests[] ={
 #if 0
   {"pause", 0, pause_test },
@@ -355,6 +391,13 @@ test_st comparison_tests[] ={
   {0, 0, 0}
 };
 
+test_st cmdline_tests[] ={
+  {"wait --quiet", 0, wait_BINARY },
+  {"wait --quiet --help", 0, wait_help_BINARY },
+  {"wait --quiet --version", 0, wait_version_BINARY },
+  {0, 0, 0}
+};
+
 collection_st collection[] ={
   {"environment", 0, 0, environment_tests},
   {"return values", 0, 0, tests_log},
@@ -363,6 +406,7 @@ collection_st collection[] ={
   {"comparison", 0, 0, comparison_tests},
   {"gearmand", 0, 0, gearmand_tests},
   {"memcached", 0, 0, memcached_tests},
+  {"cmdline", 0, 0, cmdline_tests},
   {0, 0, 0, 0}
 };