#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
-static std::string executable;
-
-static test_return_t quiet_test(void *)
-{
- const char *args[]= { "--quiet", 0 };
-
- test_true(exec_cmdline(executable, args));
- return TEST_SUCCESS;
-}
-
+static std::string executable("./clients/memstat");
static test_return_t help_test(void *)
{
- const char *args[]= { "--help", "--quiet", 0 };
+ const char *args[]= { "--help", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
return TEST_SUCCESS;
}
static test_return_t binary_TEST(void *)
{
char buffer[1024];
- snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { "--quiet", buffer, " --binary ", 0 };
+ snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+ const char *args[]= { buffer, " --binary ", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
return TEST_SUCCESS;
}
static test_return_t server_version_TEST(void *)
{
char buffer[1024];
- snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { "--quiet", buffer, " --server-version", 0 };
+ snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+ const char *args[]= { buffer, " --server-version", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
return TEST_SUCCESS;
}
static test_return_t binary_server_version_TEST(void *)
{
char buffer[1024];
- snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { "--quiet", buffer, " --binary --server-version", 0 };
+ snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+ const char *args[]= { buffer, " --binary --server-version", 0 };
+
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
- test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
test_st memstat_tests[] ={
- {"--quiet", 0, quiet_test},
{"--help", 0, help_test},
{"--binary", 0, binary_TEST},
{"--server-version", 0, server_version_TEST},
static void *world_create(server_startup_st& servers, test_return_t& error)
{
- if (HAVE_MEMCACHED_BINARY == 0)
+ if (libtest::has_memcached() == false)
{
error= TEST_SKIPPED;
return NULL;
}
- const char *argv[1]= { "memstat" };
- if (not server_startup(servers, "memcached", libtest::get_free_port(), 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
{
error= TEST_FAILURE;
}
void get_world(Framework *world)
{
- executable= "./clients/memstat";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}