Merge working tree with build tree.

[m6w6/libmemcached] / libtest / framework.cc

diff --git a/libtest/framework.cc b/libtest/framework.cc
index 969186642cbdaac4b07a5a1956c16307e59e0e14..8e049e60cfa8acc1bb649c34d9bc95aac0377a2f 100644 (file)
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -33,8 +33,6 @@ static test_return_t _default_callback(void *p)
   return TEST_SUCCESS;
 }
 
-static Runner defualt_runners;
-
 Framework::Framework() :
   collections(NULL),
   _create(NULL),
@@ -56,26 +54,8 @@ Framework::~Framework()
   }
 
   _servers.shutdown();
-}
-
-test_return_t Framework::Item::pre(void *arg)
-{
-  if (pre_run)
-  {
-    return pre_run(arg);
-  }
-
-  return TEST_SUCCESS;
-}
 
-test_return_t Framework::Item::post(void *arg)
-{
-  if (post_run)
-  {
-    return post_run(arg);
-  }
-
-  return TEST_SUCCESS;
+  delete _runner;
 }
 
 test_return_t Framework::Item::flush(void* arg, test_st* run)
@@ -122,7 +102,7 @@ libtest::Runner *Framework::runner()
 {
   if (_runner == NULL)
   {
-    _runner= &defualt_runners;
+    _runner= new Runner;
   }
   _runner->set_servers(_servers);