projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
See if we can clean up error reporting on one test for Ubuntu 12.04
[awesomized/libmemcached]
/
libtest
/
framework.cc
diff --git
a/libtest/framework.cc
b/libtest/framework.cc
index b5ad738b2a88be1ff35ed91ab08e2c39d3f36376..30f511afdbf484850dc5cb18125888e8f332040d 100644
(file)
--- a/
libtest/framework.cc
+++ b/
libtest/framework.cc
@@
-34,18
+34,19
@@
*
*/
*
*/
-#include
<config.h>
+#include
"libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/collection.h>
#include <libtest/signal.h>
#include <libtest/common.h>
#include <libtest/collection.h>
#include <libtest/signal.h>
+#include <algorithm>
#include <fnmatch.h>
#include <iostream>
namespace libtest {
#include <fnmatch.h>
#include <iostream>
namespace libtest {
-Framework::Framework(libtest::SignalThread& signal,
+Framework::Framework(libtest::SignalThread& signal
_
,
const std::string& name_,
const std::string& only_run_arg,
const std::string& wildcard_arg) :
const std::string& name_,
const std::string& only_run_arg,
const std::string& wildcard_arg) :
@@
-59,7
+60,7
@@
Framework::Framework(libtest::SignalThread& signal,
_runner(NULL),
_socket(false),
_creators_ptr(NULL),
_runner(NULL),
_socket(false),
_creators_ptr(NULL),
- _signal(signal),
+ _signal(signal
_
),
_only_run(only_run_arg),
_wildcard(wildcard_arg),
_name(name_)
_only_run(only_run_arg),
_wildcard(wildcard_arg),
_name(name_)
@@
-86,12
+87,8
@@
Framework::~Framework()
delete _runner;
delete _runner;
- for (std::vector<Collection*>::iterator iter= _collection.begin();
- iter != _collection.end();
- ++iter)
- {
- delete *iter;
- }
+ std::for_each(_collection.begin(), _collection.end(), DeleteFromVector());
+ _collection.clear();
}
bool Framework::match(const char* arg)
}
bool Framework::match(const char* arg)
@@
-118,8
+115,7
@@
void Framework::exec()
_total++;
_total++;
- try
- {
+ try {
switch ((*iter)->exec())
{
case TEST_FAILURE:
switch ((*iter)->exec())
{
case TEST_FAILURE:
@@
-137,15
+133,15
@@
void Framework::exec()
break;
}
}
break;
}
}
- catch (libtest::fatal& e)
+ catch (
const
libtest::fatal& e)
{
_failed++;
{
_failed++;
- stream::cerr(e.file(), e.line(), e.func()) << e.
mesg
();
+ stream::cerr(e.file(), e.line(), e.func()) << e.
what
();
}
}
- catch (libtest::disconnected& e)
+ catch (
const
libtest::disconnected& e)
{
_failed++;
{
_failed++;
-
stream::cerr(e.file(), e.line(), e.func()) << "Unhandled disconnection occurred: " << e.mesg
();
+
Error << "Unhandled disconnection occurred:" << e.what
();
throw;
}
catch (...)
throw;
}
catch (...)