projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix all include location, and drop versions of the library that were never shipped.
[awesomized/libmemcached]
/
tests
/
libmemcached-1.0
/
setup_and_teardowns.cc
diff --git
a/tests/libmemcached-1.0/setup_and_teardowns.cc
b/tests/libmemcached-1.0/setup_and_teardowns.cc
index 15c7a3e04062d6d8e28d6bea80972f662aab37c8..ad2126fab1548d948be5728eecc6c1e24255138d 100644
(file)
--- a/
tests/libmemcached-1.0/setup_and_teardowns.cc
+++ b/
tests/libmemcached-1.0/setup_and_teardowns.cc
@@
-38,7
+38,7
@@
#include <config.h>
#include <libtest/test.hpp>
#include <config.h>
#include <libtest/test.hpp>
-#include <libmemcached/util.h>
+#include <libmemcached
util-1.0
/util.h>
#include "tests/print.h"
#include "tests/libmemcached-1.0/setup_and_teardowns.h"
#include "tests/print.h"
#include "tests/libmemcached-1.0/setup_and_teardowns.h"
@@
-172,28
+172,22
@@
test_return_t pre_hash_fnv1a_32(memcached_st *memc)
test_return_t pre_behavior_ketama(memcached_st *memc)
{
test_return_t pre_behavior_ketama(memcached_st *memc)
{
- memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, 1);
- test_compare(MEMCACHED_SUCCESS, rc);
+ test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, 1));
- uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA);
- test_compare(value, uint64_t(1));
+ test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA), uint64_t(1));
return TEST_SUCCESS;
}
test_return_t pre_behavior_ketama_weighted(memcached_st *memc)
{
return TEST_SUCCESS;
}
test_return_t pre_behavior_ketama_weighted(memcached_st *memc)
{
- memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1);
- test_compare(MEMCACHED_SUCCESS, rc);
+ test_compare(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, true), MEMCACHED_SUCCESS);
- uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED);
- test_compare(value, uint64_t(1));
+ test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED), uint64_t(1));
- test_compare(MEMCACHED_SUCCESS,
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5));
+ test_compare(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5), MEMCACHED_SUCCESS);
- value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH);
- test_compare(MEMCACHED_HASH_MD5, memcached_hash_t(value));
+ test_compare(memcached_hash_t(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH)), MEMCACHED_HASH_MD5);
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}