X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libtest%2Frunner.h;h=d90b70e45a86596f85fd7f42436acf3c9661124e;hb=17690735658d7b44f91579df91e31da9ae185158;hp=71b18d9f443f529577857a071d73e7a3a23c61f8;hpb=47f45992107361ad58c170bdf78fdc92523fab06;p=awesomized%2Flibmemcached

diff --git a/libtest/runner.h b/libtest/runner.h
index 71b18d9f..d90b70e4 100644
--- a/libtest/runner.h
+++ b/libtest/runner.h
@@ -45,25 +45,23 @@ namespace libtest {
 */
 class Runner {
 public:
-  virtual test_return_t flush(void*);
-  virtual test_return_t run(test_callback_fn* func, void *object);
-  virtual test_return_t pre(test_callback_fn* func, void *object);
-  virtual test_return_t post(test_callback_fn* func, void *object);
+  test_return_t main(test_callback_fn* func, void *object);
+  test_return_t setup(test_callback_fn* func, void *object);
+  test_return_t teardown(test_callback_fn* func, void *object);
 
   Runner();
 
-  void set_servers(libtest::server_startup_st& arg)
-  {
-    _servers= &arg;
-  }
+  void set_servers(libtest::server_startup_st& arg);
 
-  bool check()
-  {
-    return _servers ? _servers->check() : true;
-  }
+  bool check();
 
   virtual ~Runner() { }
 
+  virtual test_return_t flush(void*);
+  virtual test_return_t run(test_callback_fn* func, void *object);
+  virtual test_return_t pre(test_callback_fn* func, void *object);
+  virtual test_return_t post(test_callback_fn* func, void *object);
+
 private:
   libtest::server_startup_st* _servers;
 };