projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix symbol subst on libevent.
[m6w6/libmemcached]
/
libtest
/
framework.cc
diff --git
a/libtest/framework.cc
b/libtest/framework.cc
index b5ad738b2a88be1ff35ed91ab08e2c39d3f36376..9fef09b2485e18ed401b2a112be7c0fa27961f44 100644
(file)
--- a/
libtest/framework.cc
+++ b/
libtest/framework.cc
@@
-34,7
+34,7
@@
*
*/
*
*/
-#include
<config.h>
+#include
"libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/collection.h>
#include <libtest/common.h>
#include <libtest/collection.h>
@@
-45,7
+45,7
@@
namespace libtest {
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
+59,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_)
@@
-118,8
+118,7
@@
void Framework::exec()
_total++;
_total++;
- try
- {
+ try {
switch ((*iter)->exec())
{
case TEST_FAILURE:
switch ((*iter)->exec())
{
case TEST_FAILURE:
@@
-145,7
+144,7
@@
void Framework::exec()
catch (libtest::disconnected& e)
{
_failed++;
catch (libtest::disconnected& e)
{
_failed++;
-
stream::cerr(e.file(), e.line(), e.func()) << "Unhandled disconnection occurred: " << e.mesg
();
+
Error << "Unhandled disconnection occurred:" << e.what
();
throw;
}
catch (...)
throw;
}
catch (...)