X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.c;h=653a3ddc905511e932814ab823eb6b388c14a5b9;hb=51ccc3f82cc9bab7cf05e3b07b8a8b319349bde0;hp=990f15e7483afc02e4dc2d22f79404aa4274ce20;hpb=c2f8357ab8824490ac5df233ab1dbba52989ac97;p=m6w6%2Flibmemcached diff --git a/tests/test.c b/tests/test.c index 990f15e7..653a3ddc 100644 --- a/tests/test.c +++ b/tests/test.c @@ -76,6 +76,7 @@ int main(int argc, char *argv[]) char *wildcard= NULL; memcached_server_st *servers; collection_st *collection; + collection_st *next; uint8_t failed; collection= gets_collections(); @@ -107,20 +108,18 @@ int main(int argc, char *argv[]) for (x= 0; x < memcached_server_list_count(servers); x++) { printf("\t%s : %u\n", servers[x].hostname, servers[x].port); - assert(servers[x].stack_responses == 0); assert(servers[x].fd == -1); assert(servers[x].cursor_active == 0); } printf("\n"); - collection_st *next; for (next= collection; next->name; next++) { test_st *run; run= next->tests; - if (collection_to_run && fnmatch(collection_to_run, next->name, FNM_CASEFOLD)) + if (collection_to_run && fnmatch(collection_to_run, next->name, 0)) continue; fprintf(stderr, "\n%s\n\n", next->name); @@ -131,8 +130,9 @@ int main(int argc, char *argv[]) memcached_st *memc; memcached_return rc; struct timeval start_time, end_time; + long int load_time; - if (wildcard && fnmatch(wildcard, run->name, FNM_CASEFOLD)) + if (wildcard && fnmatch(wildcard, run->name, 0)) continue; fprintf(stderr, "Testing %s", run->name); @@ -151,7 +151,6 @@ int main(int argc, char *argv[]) for (loop= 0; loop < memcached_server_list_count(servers); loop++) { - assert(memc->hosts[loop].stack_responses == 0); assert(memc->hosts[loop].fd == -1); assert(memc->hosts[loop].cursor_active == 0); } @@ -171,7 +170,7 @@ int main(int argc, char *argv[]) gettimeofday(&start_time, NULL); failed= run->function(memc); gettimeofday(&end_time, NULL); - long int load_time= timedif(end_time, start_time); + load_time= timedif(end_time, start_time); if (failed) fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ failed ]\n", load_time / 1000, load_time % 1000);