X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fall_tests.cc;h=5e2882c6d9d7109f5e015e315741614701454c0f;hb=7933fa8f9217d7e744876773a4033b3cda4c3c16;hp=7fae6d31311bce55c6f4b5e7f34460ca88b4367d;hpb=a18c65b0ee1a4721a4f1298f52f8b3446cf7c600;p=m6w6%2Flibmemcached diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc index 7fae6d31..5e2882c6 100644 --- a/tests/libmemcached-1.0/all_tests.cc +++ b/tests/libmemcached-1.0/all_tests.cc @@ -62,6 +62,7 @@ #include "tests/libmemcached-1.0/mem_functions.h" +#include "tests/libmemcached-1.0/encoding_key.h" /* Collections we are running */ #include "tests/libmemcached-1.0/all_tests.h" @@ -72,13 +73,13 @@ void get_world(Framework *world) { if (getenv("LIBMEMCACHED_SERVER_NUMBER")) { - int set_count= atoi(getenv("LIBMEMCACHED_SERVER_NUMBER")); - assert(set_count >= 0); - world->servers().set_count(set_count); + unsigned long int set_count= strtoul(getenv("LIBMEMCACHED_SERVER_NUMBER"), (char **) NULL, 10); + fatal_assert(set_count >= 1); + world->servers().set_servers_to_run(set_count); } else { - world->servers().set_count(8); + world->servers().set_servers_to_run(8); } world->collections= collection; @@ -95,7 +96,7 @@ void get_world(Framework *world) world->collection_startup= (test_callback_fn*)world_container_startup; world->collection_shutdown= (test_callback_fn*)world_container_shutdown; - world->set_runner(&defualt_libmemcached_runner); + world->set_runner(new LibmemcachedRunner); world->set_socket(); }