projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge working tree with build tree.
[m6w6/libmemcached]
/
libtest
/
framework.cc
diff --git
a/libtest/framework.cc
b/libtest/framework.cc
index 1541e7da7a4b4578c4f9764d6f14c6466ee0d476..3a4d85d5b9fec36ae4a8aa4a495399397f692c25 100644
(file)
--- a/
libtest/framework.cc
+++ b/
libtest/framework.cc
@@
-20,6
+20,7
@@
*/
*/
+#include <config.h>
#include <libtest/common.h>
#include <iostream>
#include <libtest/common.h>
#include <iostream>
@@
-32,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),
@@
-55,6
+54,8
@@
Framework::~Framework()
}
_servers.shutdown();
}
_servers.shutdown();
+
+ delete _runner;
}
test_return_t Framework::Item::pre(void *arg)
}
test_return_t Framework::Item::pre(void *arg)
@@
-119,7
+120,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)