projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
jenkins-promote-staging-trunk-libmemcached-11
[awesomized/libmemcached]
/
libtest
/
framework.cc
diff --git
a/libtest/framework.cc
b/libtest/framework.cc
index a9730a0e95d86294a7d20fd565f95dababf7fd3a..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;
}
return TEST_SUCCESS;
}
-static Runner defualt_runners;
-
Framework::Framework() :
collections(NULL),
_create(NULL),
Framework::Framework() :
collections(NULL),
_create(NULL),
@@
-56,26
+54,8
@@
Framework::~Framework()
}
_servers.shutdown();
}
_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)
}
test_return_t Framework::Item::flush(void* arg, test_st* run)
@@
-120,7
+100,13
@@
test_return_t Framework::Item::startup(void* arg)
libtest::Runner *Framework::runner()
{
libtest::Runner *Framework::runner()
{
- return _runner ? _runner : &defualt_runners;
+ if (_runner == NULL)
+ {
+ _runner= new Runner;
+ }
+ _runner->set_servers(_servers);
+
+ return _runner;
}
void* Framework::create(test_return_t& arg)
}
void* Framework::create(test_return_t& arg)