projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Added MEMCACHED_HASH_HSIEH.
[m6w6/libmemcached]
/
tests
/
test.c
diff --git
a/tests/test.c
b/tests/test.c
index 2ea99ff2c05d2faf01e5892ca2adeeb7c61f8836..765149ecb66c7279c155cd7709919648ed132f36 100644
(file)
--- a/
tests/test.c
+++ b/
tests/test.c
@@
-14,7
+14,7
@@
#include "test.h"
#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10
#include "test.h"
#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10
-#define TEST_SERVERS
1
+#define TEST_SERVERS
5
long int timedif(struct timeval a, struct timeval b)
{
long int timedif(struct timeval a, struct timeval b)
{
@@
-54,14
+54,17
@@
void server_shutdown(char *server_string)
{
unsigned int x;
{
unsigned int x;
- for (x= 0; x < TEST_SERVERS; x++)
- {
- char buffer[1024]; /* Nothing special for number */
- sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
- system(buffer);
- }
if (server_string)
if (server_string)
+ {
+ for (x= 0; x < TEST_SERVERS; x++)
+ {
+ char buffer[1024]; /* Nothing special for number */
+ sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
+ system(buffer);
+ }
+
free(server_string);
free(server_string);
+ }
}
int main(int argc, char *argv[])
}
int main(int argc, char *argv[])
@@
-123,25
+126,28
@@
int main(int argc, char *argv[])
for (x= 0; run->name; run++)
{
for (x= 0; run->name; run++)
{
+ unsigned int loop;
+ memcached_st *memc;
+ memcached_return rc;
+ struct timeval start_time, end_time;
+
if (wildcard && strcmp(wildcard, run->name))
continue;
fprintf(stderr, "Testing %s", run->name);
if (wildcard && strcmp(wildcard, run->name))
continue;
fprintf(stderr, "Testing %s", run->name);
- memcached_st *memc;
- memcached_return rc;
- struct timeval start_time, end_time;
-
memc= memcached_create(NULL);
assert(memc);
memc= memcached_create(NULL);
assert(memc);
- if (run->requires_flush)
- memcached_flush(memc, 0);
-
rc= memcached_server_push(memc, servers);
assert(rc == MEMCACHED_SUCCESS);
rc= memcached_server_push(memc, servers);
assert(rc == MEMCACHED_SUCCESS);
- unsigned int loop;
+ if (run->requires_flush)
+ {
+ memcached_flush(memc, 0);
+ memcached_quit(memc);
+ }
+
for (loop= 0; loop < memcached_server_list_count(servers); loop++)
{
assert(memc->hosts[loop].stack_responses == 0);
for (loop= 0; loop < memcached_server_list_count(servers); loop++)
{
assert(memc->hosts[loop].stack_responses == 0);