X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fall_tests.cc;h=a7cbd2c0aad1d4f6b10b40de240851ba5e5781ad;hb=a20205ad8b1a30fbc419e016a633b40b739073c7;hp=8561c9594218084a054884ace674406afb71c633;hpb=339fccdc1ec98b2e7eaf7515b4f0086d1d56396d;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc
index 8561c959..a7cbd2c0 100644
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -35,11 +35,9 @@
  *
  */
 
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-
-#include <config.h>
-#include <libtest/test.hpp>
-
+#include "mem_config.h"
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 #include "tests/basic.h"
 #include "tests/debug.h"
 #include "tests/deprecated.h"
@@ -47,10 +45,10 @@
 #include "tests/exist.h"
 #include "tests/ketama.h"
 #include "tests/namespace.h"
-#include "tests/parser.h"
 #include "tests/libmemcached-1.0/dump.h"
 #include "tests/libmemcached-1.0/generate.h"
 #include "tests/libmemcached-1.0/haldenbrand.h"
+#include "tests/libmemcached-1.0/parser.h"
 #include "tests/libmemcached-1.0/stat.h"
 #include "tests/touch.h"
 #include "tests/callbacks.h"
@@ -64,40 +62,36 @@
 
 
 #include "tests/libmemcached-1.0/mem_functions.h"
+#include "tests/libmemcached-1.0/encoding_key.h"
 
 /* Collections we are running */
 #include "tests/libmemcached-1.0/all_tests.h"
 
 #include "tests/libmemcached_world.h"
 
-void get_world(Framework *world)
+#include <algorithm>
+
+void get_world(libtest::Framework* world)
 {
   if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
   {
-    int set_count= atoi(getenv("LIBMEMCACHED_SERVER_NUMBER"));
-    assert(set_count >= 0);
-    world->servers().set_count(set_count);
+    unsigned long int set_count= strtoul(getenv("LIBMEMCACHED_SERVER_NUMBER"), (char **) NULL, 10);
+    fatal_assert(set_count >= 1);
+    world->servers().set_servers_to_run(set_count);
   }
   else
   {
-    world->servers().set_count(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;
-
-  world->_create= (test_callback_create_fn*)world_create;
-  world->_destroy= (test_callback_destroy_fn*)world_destroy;
-
-  world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item.set_pre((test_callback_fn*)world_pre_run);
-  world->item.set_flush((test_callback_fn*)world_flush);
-  world->item.set_post((test_callback_fn*)world_post_run);
-  world->_on_error= (test_callback_error_fn*)world_on_error;
+  world->collections(collection);
 
-  world->collection_startup= (test_callback_fn*)world_container_startup;
-  world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
+  world->create((test_callback_create_fn*)world_create);
+  world->destroy((test_callback_destroy_fn*)world_destroy);
 
-  world->set_runner(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 
   world->set_socket();
 }