projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Cleanuped up make test
[m6w6/libmemcached]
/
tests
/
function.c
diff --git
a/tests/function.c
b/tests/function.c
index 640fbfe45d19c9147d8f1be845ad8964892ab18b..b5af2b5038eb7cae54dc6f58f4244a624ce723a4 100644
(file)
--- a/
tests/function.c
+++ b/
tests/function.c
@@
-148,6
+148,7
@@
uint8_t append_test(memcached_st *memc)
assert(!memcmp(value, "we the people", strlen("we the people")));
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
assert(!memcmp(value, "we the people", strlen("we the people")));
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
+ free(value);
return 0;
}
return 0;
}
@@
-188,11
+189,12
@@
uint8_t append_binary_test(memcached_st *memc)
store_ptr= (unsigned int *)value;
x= 0;
store_ptr= (unsigned int *)value;
x= 0;
- while (
*store_ptr
)
+ while (
(size_t)store_ptr < (size_t)(value + value_length)
)
{
assert(*store_ptr == store_list[x++]);
store_ptr++;
}
{
assert(*store_ptr == store_list[x++]);
store_ptr++;
}
+ free(value);
return 0;
}
return 0;
}
@@
-311,6
+313,7
@@
uint8_t prepend_test(memcached_st *memc)
assert(!memcmp(value, "we the people", strlen("we the people")));
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
assert(!memcmp(value, "we the people", strlen("we the people")));
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
+ free(value);
return 0;
}
return 0;
}
@@
-539,13
+542,14
@@
uint8_t get_test4(memcached_st *memc)
return 0;
}
return 0;
}
+/* Do not copy the style of this code, I just access hosts to testthis function */
uint8_t stats_servername_test(memcached_st *memc)
{
memcached_return rc;
memcached_stat_st stat;
rc= memcached_stat_servername(&stat, NULL,
uint8_t stats_servername_test(memcached_st *memc)
{
memcached_return rc;
memcached_stat_st stat;
rc= memcached_stat_servername(&stat, NULL,
-
"localhost"
,
-
MEMCACHED_DEFAULT_PORT
);
+
memc->hosts[0].hostname
,
+
memc->hosts[0].port
);
return 0;
}
return 0;
}
@@
-645,6
+649,7
@@
uint8_t mget_result_test(memcached_st *memc)
{
assert(results);
}
{
assert(results);
}
+
while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL)
assert(!results);
assert(rc == MEMCACHED_NOTFOUND);
while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL)
assert(!results);
assert(rc == MEMCACHED_NOTFOUND);
@@
-815,10
+820,9
@@
uint8_t get_stats(memcached_st *memc)
for (x= 0; x < memcached_server_count(memc); x++)
{
for (x= 0; x < memcached_server_count(memc); x++)
{
- list= memcached_stat_get_keys(memc,
&stat[x]
, &rc);
+ list= memcached_stat_get_keys(memc,
stat+x
, &rc);
assert(rc == MEMCACHED_SUCCESS);
assert(rc == MEMCACHED_SUCCESS);
- for (ptr= list; *ptr; ptr++)
- printf("Found key %s\n", *ptr);
+ for (ptr= list; *ptr; ptr++);
free(list);
}
free(list);
}
@@
-1411,6
+1415,13
@@
uint8_t string_alloc_append_toobig(memcached_st *memc)
return 0;
}
return 0;
}
+uint8_t cleanup_pairs(memcached_st *memc)
+{
+ pairs_free(global_pairs);
+
+ return 0;
+}
+
uint8_t generate_data(memcached_st *memc)
{
unsigned long long x;
uint8_t generate_data(memcached_st *memc)
{
unsigned long long x;
@@
-1565,6
+1576,14
@@
memcached_return pre_crc(memcached_st *memc)
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
+memcached_return pre_hsieh(memcached_st *memc)
+{
+ memcached_hash value= MEMCACHED_HASH_HSIEH;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+ return MEMCACHED_SUCCESS;
+}
+
memcached_return pre_hash_fnv1_64(memcached_st *memc)
{
memcached_hash value= MEMCACHED_HASH_FNV1_64;
memcached_return pre_hash_fnv1_64(memcached_st *memc)
{
memcached_hash value= MEMCACHED_HASH_FNV1_64;
@@
-1764,6
+1783,7
@@
test_st generate_tests[] ={
{"get_read", 0, get_read },
{"mget_read", 0, mget_read },
{"mget_read_result", 0, mget_read_result },
{"get_read", 0, get_read },
{"mget_read", 0, mget_read },
{"mget_read_result", 0, mget_read_result },
+ {"cleanup", 0, cleanup_pairs },
{0, 0, 0}
};
{0, 0, 0}
};
@@
-1774,6
+1794,7
@@
collection_st collection[] ={
{"nodelay", pre_nodelay, 0, tests},
{"md5", pre_md5, 0, tests},
{"crc", pre_crc, 0, tests},
{"nodelay", pre_nodelay, 0, tests},
{"md5", pre_md5, 0, tests},
{"crc", pre_crc, 0, tests},
+ {"hsieh", pre_hsieh, 0, tests},
{"fnv1_64", pre_hash_fnv1_64, 0, tests},
{"fnv1a_64", pre_hash_fnv1a_64, 0, tests},
{"fnv1_32", pre_hash_fnv1_32, 0, tests},
{"fnv1_64", pre_hash_fnv1_64, 0, tests},
{"fnv1a_64", pre_hash_fnv1a_64, 0, tests},
{"fnv1_32", pre_hash_fnv1_32, 0, tests},
@@
-1789,6
+1810,7
@@
collection_st collection[] ={
{"result", 0, 0, result_tests},
{"user", 0, 0, user_tests},
{"generate", 0, 0, generate_tests},
{"result", 0, 0, result_tests},
{"user", 0, 0, user_tests},
{"generate", 0, 0, generate_tests},
+ {"generate_hsieh", pre_hsieh, 0, generate_tests},
{"generate_nonblock", pre_nonblock, 0, generate_tests},
{0, 0, 0, 0}
};
{"generate_nonblock", pre_nonblock, 0, generate_tests},
{0, 0, 0, 0}
};