*
*/
-#include <config.h>
+#include <mem_config.h>
#include <libtest/test.hpp>
#include <climits>
using namespace libtest;
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
#include <tests/debug.h>
#include <tests/print.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
/* Dump each server's keys */
static memcached_return_t print_keys_callback(const memcached_st *,
}
static memcached_return_t server_wrapper_for_dump_callback(const memcached_st *,
- memcached_server_instance_st server,
+ const memcached_instance_st * server,
void *)
{
memcached_st *memc= memcached_create(NULL);
- if (server->type == MEMCACHED_CONNECTION_UNIX_SOCKET)
+ if (strcmp(memcached_server_type(server), "SOCKET") == 0)
{
if (memcached_failed(memcached_server_add_unix_socket(memc, memcached_server_name(server))))
{
0, &rc);
if (require_all)
{
- test_true_got(value, keys[x]);
+ test_true(value);
if (key_matches_value)
{
test_strcmp(keys[x], value);
}
else if (memcached_success(rc))
{
- test_warn_hint(value, keys[x]);
+ test_warn(value, "get() did not return a value");
if (value and key_matches_value)
{
test_strcmp(keys[x], value);