X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fall_tests.cc;h=5e2882c6d9d7109f5e015e315741614701454c0f;hb=7933fa8f9217d7e744876773a4033b3cda4c3c16;hp=5aa59f8852e048b098ea8ade94a651b4d4b3947b;hpb=9ccc920d86467ea463a07fd99e5ef4ea804c7800;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc
index 5aa59f88..5e2882c6 100644
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -35,8 +35,6 @@
  *
  */
 
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-
 #include <config.h>
 #include <libtest/test.hpp>
 
@@ -64,6 +62,7 @@
 
 
 #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"
@@ -72,6 +71,17 @@
 
 void get_world(Framework *world)
 {
+  if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
+  {
+    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_servers_to_run(8);
+  }
+
   world->collections= collection;
 
   world->_create= (test_callback_create_fn*)world_create;
@@ -86,7 +96,7 @@ void get_world(Framework *world)
   world->collection_startup= (test_callback_fn*)world_container_startup;
   world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
 
-  world->set_runner(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 
   world->set_socket();
 }