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;
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;
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 },
{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},
{"comparison", 0, 0, comparison_tests},
{"gearmand", 0, 0, gearmand_tests},
{"memcached", 0, 0, memcached_tests},
+ {"cmdline", 0, 0, cmdline_tests},
{0, 0, 0, 0}
};