X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.cc;h=b9d817b5ab457e9d01178312941a5f56b036046f;hb=bb79afb7484c21ee590a15399e2e8a39cca7b627;hp=969186642cbdaac4b07a5a1956c16307e59e0e14;hpb=015b6142ad6c3b496437d397416aacb776a42aed;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.cc b/libtest/framework.cc
index 96918664..b9d817b5 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -26,22 +26,10 @@
 
 using namespace libtest;
 
-static test_return_t _default_callback(void *p)
-{
-  (void)p;
-
-  return TEST_SUCCESS;
-}
-
-static Runner defualt_runners;
-
 Framework::Framework() :
   collections(NULL),
   _create(NULL),
   _destroy(NULL),
-  collection_startup(_default_callback),
-  collection_shutdown(_default_callback),
-  _on_error(NULL),
   _runner(NULL),
   _socket(false),
   _creators_ptr(NULL)
@@ -56,73 +44,15 @@ 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;
-}
-
-test_return_t Framework::Item::flush(void* arg, test_st* run)
-{
-  if (run->requires_flush and _flush)
-  {
-    return _flush(arg);
-  }
-
-  return TEST_SUCCESS;
-}
-
-test_return_t Framework::on_error(const test_return_t rc, void* arg)
-{
-  if (_on_error and test_failed(_on_error(rc, arg)))
-  {
-    return TEST_FAILURE;
-  }
-
-  return TEST_SUCCESS;
-}
-
-test_return_t Framework::startup(void* arg)
-{
-  if (collection_startup)
-  {
-    return collection_startup(arg);
-  }
-
-  return TEST_SUCCESS;
-}
-
-test_return_t Framework::Item::startup(void* arg)
-{
-  if (_startup)
-  {
-    return _startup(arg);
-  }
 
-  return TEST_SUCCESS;
+  delete _runner;
 }
 
 libtest::Runner *Framework::runner()
 {
   if (_runner == NULL)
   {
-    _runner= &defualt_runners;
+    _runner= new Runner;
   }
   _runner->set_servers(_servers);