Merge working tree with build tree.

[m6w6/libmemcached] / tests / libmemcached-1.0 / atomsmasher.cc

diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc
index 73162d3a225c37d072f48dff4e23976449454151..2b7e9c12a4ab28bccd30e83b231c3e5075ee395a 100644 (file)
--- a/tests/libmemcached-1.0/atomsmasher.cc
+++ b/tests/libmemcached-1.0/atomsmasher.cc
@@ -275,8 +275,6 @@ collection_st collection[] ={
 };
 
 
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-
 #include "tests/libmemcached_world.h"
 
 void get_world(Framework *world)
@@ -288,12 +286,10 @@ void get_world(Framework *world)
 
   world->item._startup= (test_callback_fn*)world_test_startup;
   world->item._flush= (test_callback_fn*)world_flush;
-  world->item.set_pre((test_callback_fn*)world_pre_run);
-  world->item.set_post((test_callback_fn*)world_post_run);
   world->_on_error= (test_callback_error_fn*)world_on_error;
 
   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);
 }