#include <config.h>
#include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
using namespace libtest;
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;
}
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));
+ test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
memcached_free(memc);
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;
if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
{
error= TEST_FAILURE;
+ return NULL;
}
return &servers;
}
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
{
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}