cppcheck warnings fixed.

[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 4d4d4ca8be20b1a40f1720df354b0d4547fbd2d0..8aeac4d9694b5cfa7af03744d2a86c291f2daf3b 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,7 +81,9 @@ void get_world(Framework *world)
   }
   else
   {
-    world->servers().set_servers_to_run(8);
+    // 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);