projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Abstract out read method.
[m6w6/libmemcached]
/
libtest
/
framework.cc
diff --git
a/libtest/framework.cc
b/libtest/framework.cc
index eb0f4120de3982eacdc485d3a5e487f37a7461bf..ea7ca66505e79af9811da02b3701f854c772f151 100644
(file)
--- a/
libtest/framework.cc
+++ b/
libtest/framework.cc
@@
-48,13
+48,14
@@
using namespace libtest;
Framework::Framework(libtest::SignalThread& signal,
const std::string& only_run_arg,
const std::string& wildcard_arg) :
Framework::Framework(libtest::SignalThread& signal,
const std::string& only_run_arg,
const std::string& wildcard_arg) :
- collections(NULL),
+
_
collections(NULL),
_total(0),
_success(0),
_skipped(0),
_failed(0),
_create(NULL),
_destroy(NULL),
_total(0),
_success(0),
_skipped(0),
_failed(0),
_create(NULL),
_destroy(NULL),
+ _on_error(NULL),
_runner(NULL),
_socket(false),
_creators_ptr(NULL),
_runner(NULL),
_socket(false),
_creators_ptr(NULL),
@@
-64,7
+65,7
@@
Framework::Framework(libtest::SignalThread& signal,
{
get_world(this);
{
get_world(this);
- for (collection_st *next= collections; next and next->name; next++)
+ for (collection_st *next=
_
collections; next and next->name; next++)
{
_collection.push_back(new Collection(this, next));
}
{
_collection.push_back(new Collection(this, next));
}
@@
-87,7
+88,6
@@
Framework::~Framework()
{
delete *iter;
}
{
delete *iter;
}
- _collection.clear();
}
bool Framework::match(const char* arg)
}
bool Framework::match(const char* arg)