projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
libtest: fix #40 (use nullptr instead of NULL)
[awesomized/libmemcached]
/
libtest
/
runner.cc
diff --git
a/libtest/runner.cc
b/libtest/runner.cc
index fdabb7c61e2c5ed3c018244e1b6447d236b2175b..2f94ad37b870602333f6966389e7eee2f9bdf578 100644
(file)
--- a/
libtest/runner.cc
+++ b/
libtest/runner.cc
@@
-50,24
+50,24
@@
test_return_t Runner::main(test_callback_fn* func, void *object)
try {
ret= run(func, object);
}
try {
ret= run(func, object);
}
- catch (
libtest::__skipped
e)
+ catch (
const libtest::__skipped&
e)
{
ret= TEST_SKIPPED;
}
{
ret= TEST_SKIPPED;
}
- catch (
libtest::__failure
e)
+ catch (
const libtest::__failure&
e)
{
libtest::stream::make_cerr(e.file(), e.line(), e.func()) << e.what();
ret= TEST_FAILURE;
}
{
libtest::stream::make_cerr(e.file(), e.line(), e.func()) << e.what();
ret= TEST_FAILURE;
}
- catch (
libtest::__success
)
+ catch (
const libtest::__success&
)
{
ret= TEST_SUCCESS;
}
{
ret= TEST_SUCCESS;
}
- catch (
libtest::fatal& e
)
+ catch (
const libtest::fatal&
)
{
throw;
}
{
throw;
}
- catch (std::exception& e)
+ catch (
const
std::exception& e)
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
throw;
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
throw;
@@
-87,24
+87,24
@@
test_return_t Runner::setup(test_callback_fn* func, void *object)
try {
ret= pre(func, object);
}
try {
ret= pre(func, object);
}
- catch (
libtest::__skipped
e)
+ catch (
const libtest::__skipped&
e)
{
ret= TEST_SKIPPED;
}
{
ret= TEST_SKIPPED;
}
- catch (
libtest::__failure
e)
+ catch (
const libtest::__failure&
e)
{
libtest::stream::make_cout(e.file(), e.line(), e.func()) << e.what();
ret= TEST_FAILURE;
}
{
libtest::stream::make_cout(e.file(), e.line(), e.func()) << e.what();
ret= TEST_FAILURE;
}
- catch (
libtest::__success
)
+ catch (
const libtest::__success&
)
{
ret= TEST_SUCCESS;
}
{
ret= TEST_SUCCESS;
}
- catch (libtest::fatal& e)
+ catch (
const
libtest::fatal& e)
{
throw;
}
{
throw;
}
- catch (std::exception& e)
+ catch (
const
std::exception& e)
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
throw;
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
throw;
@@
-124,24
+124,24
@@
test_return_t Runner::teardown(test_callback_fn* func, void *object)
try {
ret= post(func, object);
}
try {
ret= post(func, object);
}
- catch (
libtest::__skipped
e)
+ catch (
const libtest::__skipped&
e)
{
ret= TEST_SKIPPED;
}
{
ret= TEST_SKIPPED;
}
- catch (
libtest::__failure
e)
+ catch (
const libtest::__failure&
e)
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
ret= TEST_FAILURE;
}
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
ret= TEST_FAILURE;
}
- catch (
libtest::__success
)
+ catch (
const libtest::__success&
)
{
ret= TEST_SUCCESS;
}
{
ret= TEST_SUCCESS;
}
- catch (libtest::fatal& e)
+ catch (
const
libtest::fatal& e)
{
throw;
}
{
throw;
}
- catch (std::exception& e)
+ catch (
const
std::exception& e)
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
throw;
{
libtest::stream::make_cerr(LIBYATL_DEFAULT_PARAM) << e.what();
throw;