X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flibmemcached-1.0%2Fall_tests.cc;h=a7cbd2c0aad1d4f6b10b40de240851ba5e5781ad;hb=d5f5c1f9dcb1da3cd89ca6b14b87af5d9630991b;hp=bfa64c24aff64d5957df34b49e488ab16b35a808;hpb=19fae5d41322f8230ed5e0697ec0ce51e1ccdeaa;p=awesomized%2Flibmemcached diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc index bfa64c24..a7cbd2c0 100644 --- a/tests/libmemcached-1.0/all_tests.cc +++ b/tests/libmemcached-1.0/all_tests.cc @@ -35,9 +35,9 @@ * */ -#include -#include - +#include "mem_config.h" +#include "libtest/test.hpp" +#include "libmemcached-1.0/memcached.h" #include "tests/basic.h" #include "tests/debug.h" #include "tests/deprecated.h" @@ -71,7 +71,7 @@ #include -void get_world(Framework *world) +void get_world(libtest::Framework* world) { if (getenv("LIBMEMCACHED_SERVER_NUMBER")) { @@ -82,7 +82,7 @@ void get_world(Framework *world) else { // Assume a minimum of 3, and a maximum of 8 - world->servers().set_servers_to_run(libtest::number_of_cpus() > 3 ? + world->servers().set_servers_to_run((libtest::number_of_cpus() > 3) ? std::min(libtest::number_of_cpus(), size_t(8)) : 3); }