Update all config.h usage.

[m6w6/libmemcached] / tests / libmemcached-1.0 / all_tests.cc

diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc
index 2efbdf27803f931a57c04e2bd6388bb92f8a69d0..a471d89a5ab63e96024edf86599df527a874144a 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include "tests/basic.h"
@@ -69,7 +69,9 @@
 
 #include "tests/libmemcached_world.h"
 
-void get_world(Framework *world)
+#include <algorithm>
+
+void get_world(libtest::Framework* world)
 {
   if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
   {
@@ -79,8 +81,9 @@ void get_world(Framework *world)
   }
   else
   {
-    world->servers().set_servers_to_run(libtest::number_of_cpus() > 3 ? 
-                                        libtest::number_of_cpus() : 3);
+    // Assume a minimum of 3, and a maximum of 8
+    world->servers().set_servers_to_run((libtest::number_of_cpus() > 3) ? 
+                                        std::min(libtest::number_of_cpus(), size_t(8)) : 3);
   }
 
   world->collections(collection);