X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fall_tests.cc;h=8aeac4d9694b5cfa7af03744d2a86c291f2daf3b;hb=9e4ae978d7d40c4f1c7d221c61a07a31a5e270d5;hp=2efbdf27803f931a57c04e2bd6388bb92f8a69d0;hpb=262486489d4dec5f7af6046a27b9e6b337b45ea9;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc
index 2efbdf27..8aeac4d9 100644
--- 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
   {
-    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);