X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmem_functions.c;h=ad81f9d91dae9c23b0ca0e2f02fd88090679475a;hb=c79b88bc75d37c933e9d05c83113ccb26ded3683;hp=a94787bba84396a9f8d8685982994b5d7cda1470;hpb=682a79f2cc82e31d37ca9db6bb5ec631c197d52c;p=m6w6%2Flibmemcached diff --git a/tests/mem_functions.c b/tests/mem_functions.c index a94787bb..ad81f9d9 100644 --- a/tests/mem_functions.c +++ b/tests/mem_functions.c @@ -2945,6 +2945,11 @@ static void fail(int unused __attribute__((unused))) static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) { +#ifdef WIN32 + (void)memc; + (void)key_count; + return TEST_SKIPPED; +#else memcached_return_t rc; unsigned int x; char **keys; @@ -2993,6 +2998,7 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) memcached_free(memc_clone); return TEST_SUCCESS; +#endif } static test_return_t user_supplied_bug21(memcached_st *memc) @@ -4425,20 +4431,20 @@ static test_return_t util_version_test(memcached_st *memc) test_true(if_successful == true); if (instance->micro_version > 0) - if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, instance->micro_version -1); + if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, (uint8_t)(instance->micro_version -1)); else if (instance->minor_version > 0) - if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version - 1, instance->micro_version); + if_successful= libmemcached_util_version_check(memc, instance->major_version, (uint8_t)(instance->minor_version - 1), instance->micro_version); else if (instance->major_version > 0) - if_successful= libmemcached_util_version_check(memc, instance->major_version -1, instance->minor_version, instance->micro_version); + if_successful= libmemcached_util_version_check(memc, (uint8_t)(instance->major_version -1), instance->minor_version, instance->micro_version); test_true(if_successful == true); if (instance->micro_version > 0) - if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, instance->micro_version +1); + if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, (uint8_t)(instance->micro_version +1)); else if (instance->minor_version > 0) - if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version +1, instance->micro_version); + if_successful= libmemcached_util_version_check(memc, instance->major_version, (uint8_t)(instance->minor_version +1), instance->micro_version); else if (instance->major_version > 0) - if_successful= libmemcached_util_version_check(memc, instance->major_version +1, instance->minor_version, instance->micro_version); + if_successful= libmemcached_util_version_check(memc, (uint8_t)(instance->major_version +1), instance->minor_version, instance->micro_version); test_true(if_successful == false); @@ -5725,6 +5731,7 @@ static test_return_t test_cull_servers(memcached_st *memc) return TEST_SUCCESS; } + static memcached_return_t stat_printer(memcached_server_instance_st server, const char *key, size_t key_length, const char *value, size_t value_length,