Merge working tree with build tree.

[m6w6/libmemcached] / libtest / framework.cc

diff --git a/libtest/framework.cc b/libtest/framework.cc
index dc9bddd95c1be16f7b2b5e8cb74608092659b132..3bab5f0ad3f414f702529f1994c842a4847a746f 100644 (file)
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -1,8 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest, libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -34,96 +34,43 @@
  *
  */
 
-
+#include <config.h>
 #include <libtest/common.h>
 #include <iostream>
 
 using namespace libtest;
 
-static test_return_t _runner_default(test_callback_fn func, void *p)
-{
-  if (func)
-  {
-    return func(p);
-  }
-
-  return TEST_SUCCESS;
-}
-
-static Runner defualt_runners= {
-  _runner_default,
-  _runner_default,
-  _runner_default
-};
-
-static test_return_t _default_callback(void *p)
-{
-  (void)p;
-
-  return TEST_SUCCESS;
-}
-
 Framework::Framework() :
   collections(NULL),
   _create(NULL),
   _destroy(NULL),
-  collection_startup(_default_callback),
-  collection_shutdown(_default_callback),
-  _on_error(NULL),
-  runner(&defualt_runners),
+  _runner(NULL),
+  _socket(false),
   _creators_ptr(NULL)
 {
 }
 
 Framework::~Framework()
 {
-  if (_destroy)
+  if (_destroy and _destroy(_creators_ptr))
   {
-    if (test_failed(_destroy(_creators_ptr)))
-    {
-      Error << "Failure in _destroy(), some resources may not have been cleaned up.";
-    }
+    Error << "Failure in _destroy(), some resources may not have been cleaned up.";
   }
-}
 
-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);
-  }
+  _servers.shutdown();
 
-  return TEST_SUCCESS;
+  delete _runner;
 }
 
-test_return_t Framework::Item::startup(void* arg)
+libtest::Runner *Framework::runner()
 {
-  if (_startup)
+  if (_runner == NULL)
   {
-    return _startup(arg);
+    _runner= new Runner;
   }
+  _runner->set_servers(_servers);
 
-  return TEST_SUCCESS;
+  return _runner;
 }
 
 void* Framework::create(test_return_t& arg)
@@ -131,7 +78,7 @@ void* Framework::create(test_return_t& arg)
   arg= TEST_SUCCESS;
   if (_create)
   {
-    return _creators_ptr= _create(&arg);
+    return _creators_ptr= _create(_servers, arg);
   }
 
   return NULL;