Fix error messages/unlimited CPU utilization.

[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..bfa64c24aff64d5957df34b49e488ab16b35a808 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -69,6 +69,8 @@
 
 #include "tests/libmemcached_world.h"
 
+#include <algorithm>
+
 void get_world(Framework *world)
 {
   if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
@@ -79,8 +81,9 @@ 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 ? 
-                                        libtest::number_of_cpus() : 3);
+                                        std::min(libtest::number_of_cpus(), size_t(8)) : 3);
   }
 
   world->collections(collection);