Diligently check poll() a bit more. Also determine number of servers based on cores...

[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 e5a6d2bf279477f821f6ab3ad9e1104c0b4da6a3..2efbdf27803f931a57c04e2bd6388bb92f8a69d0 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -79,13 +79,14 @@ void get_world(Framework *world)
   }
   else
   {
-    world->servers().set_servers_to_run(8);
+    world->servers().set_servers_to_run(libtest::number_of_cpus() > 3 ? 
+                                        libtest::number_of_cpus() : 3);
   }
 
-  world->collections= collection;
+  world->collections(collection);
 
-  world->_create= (test_callback_create_fn*)world_create;
-  world->_destroy= (test_callback_destroy_fn*)world_destroy;
+  world->create((test_callback_create_fn*)world_create);
+  world->destroy((test_callback_destroy_fn*)world_destroy);
 
   world->set_runner(new LibmemcachedRunner);