projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update/fix for SASL
[m6w6/libmemcached]
/
libtest
/
collection.cc
diff --git
a/libtest/collection.cc
b/libtest/collection.cc
index 26e8bb44e33d455ef725546dc98fe338da3427b3..b3bdbdeee69548e43776e62340292642e4e83e76 100644
(file)
--- a/
libtest/collection.cc
+++ b/
libtest/collection.cc
@@
-34,7
+34,7
@@
*
*/
*
*/
-#include
<config.h>
+#include
"libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/common.h>
@@
-85,7
+85,7
@@
Collection::Collection(Framework* frame_arg,
_skipped(0),
_failed(0),
_total(0),
_skipped(0),
_failed(0),
_total(0),
- _formatter(_name)
+ _formatter(
frame_arg->name(),
_name)
{
fatal_assert(arg);
}
{
fatal_assert(arg);
}
@@
-118,19
+118,21
@@
test_return_t Collection::exec()
}
}
}
}
- alarm(600);
+ set_alarm();
+
try
{
return_code= runner_code(_frame, run, _timer);
}
catch (...)
{
try
{
return_code= runner_code(_frame, run, _timer);
}
catch (...)
{
- alarm(0);
+ cancel_alarm();
+
throw;
}
throw;
}
-
alarm(0
);
+
libtest::cancel_alarm(
);
}
}
- catch (libtest::
exception
&e)
+ catch (libtest::
fatal
&e)
{
stream::cerr(e.file(), e.line(), e.func()) << e.what();
_failed++;
{
stream::cerr(e.file(), e.line(), e.func()) << e.what();
_failed++;