projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-188
[awesomized/libmemcached]
/
libtest
/
collection.cc
diff --git
a/libtest/collection.cc
b/libtest/collection.cc
index b3bdbdeee69548e43776e62340292642e4e83e76..1b4915e13d75ac1802e40a9cd37906b83fb814ad 100644
(file)
--- a/
libtest/collection.cc
+++ b/
libtest/collection.cc
@@
-38,6
+38,7
@@
#include <libtest/common.h>
#include <libtest/common.h>
+// @todo possibly have this code fork off so if it fails nothing goes bad
static test_return_t runner_code(libtest::Framework* frame,
test_st* run,
libtest::Timer& _timer)
static test_return_t runner_code(libtest::Framework* frame,
test_st* run,
libtest::Timer& _timer)
@@
-50,7
+51,7
@@
static test_return_t runner_code(libtest::Framework* frame,
try
{
_timer.reset();
try
{
_timer.reset();
- return_code= frame->runner()->
ru
n(run->test_fn, frame->creators_ptr());
+ return_code= frame->runner()->
mai
n(run->test_fn, frame->creators_ptr());
}
// Special case where check for the testing of the exception
// system.
}
// Special case where check for the testing of the exception
// system.
@@
-92,7
+93,7
@@
Collection::Collection(Framework* frame_arg,
test_return_t Collection::exec()
{
test_return_t Collection::exec()
{
- if (test_success(_frame->runner()->
pre
(_pre, _frame->creators_ptr())))
+ if (test_success(_frame->runner()->
setup
(_pre, _frame->creators_ptr())))
{
for (test_st *run= _tests; run->name; run++)
{
{
for (test_st *run= _tests; run->name; run++)
{
@@
-165,7
+166,7
@@
test_return_t Collection::exec()
#endif
}
#endif
}
- (void) _frame->runner()->
post
(_post, _frame->creators_ptr());
+ (void) _frame->runner()->
teardown
(_post, _frame->creators_ptr());
}
if (_failed == 0 and _skipped == 0 and _success)
}
if (_failed == 0 and _skipped == 0 and _success)