Test that we are cycling the servers we are creating during testing.
*/
-#include <config.h>
+#include <mem_config.h>
#include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
using namespace libtest;
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
-static std::string executable;
-
-static test_return_t quiet_test(void *)
-{
- const char *args[]= { "--quiet", 0 };
-
- test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
+static std::string executable("./clients/memdump");
static test_return_t help_test(void *)
{
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+ test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
return TEST_SUCCESS;
}
static test_return_t FOUND_test(void *)
{
char buffer[1024];
- snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+ int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
const char *args[]= { buffer, 0 };
- memcached_st *memc= memcached(buffer, strlen(buffer));
+ memcached_st *memc= memcached(buffer, length);
test_true(memc);
test_compare(MEMCACHED_SUCCESS,
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_SUCCESS, rc);
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+ length= snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+ test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
memcached_free(memc);
}
test_st memdump_tests[] ={
- {"--quiet", true, quiet_test },
{"--help", true, help_test },
{"--server", true, server_test },
{"FOUND", true, FOUND_test },
{0, 0, 0, 0}
};
-static void *world_create(server_startup_st& servers, test_return_t& error)
+static void *world_create(server_startup_st& servers, test_return_t&)
{
- if (HAVE_MEMCACHED_BINARY == 0)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
-
- const char *argv[1]= { "memdump" };
- if (not server_startup(servers, "memcached", libtest::default_port(), 1, argv))
- {
- error= TEST_FAILURE;
- }
+ SKIP_UNLESS(libtest::has_memcached());
+
+ ASSERT_TRUE(server_startup(servers, "memcached", libtest::default_port(), NULL));
return &servers;
}
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
{
- executable= "./clients/memdump";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}