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;
#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+# pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
static std::string executable;
static test_return_t quiet_test(void *)
{
- const char *args[]= { "-q", 0 };
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "%d", int(get_free_port()));
+ const char *args[]= { "-p", buffer, "-q", 0 };
test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "%d", int(default_port()));
- const char *args[]= { "-p", buffer, " -a ", 0 };
+ const char *args[]= { "-p", buffer, "-a", 0 };
test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "%d", int(default_port()));
- const char *args[]= { "-p", buffer, " -b ", 0 };
+ const char *args[]= { "-p", buffer, "-b", 0 };
test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
{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]= { "memcapable" };
- if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
- {
- error= TEST_FAILURE;
- }
+ SKIP_UNLESS(libtest::has_memcached());
+
+ SKIP_UNLESS(server_startup(servers, "memcached", libtest::default_port(), NULL));
return &servers;
}
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
{
executable= "./clients/memcapable";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}