feedc0de/boost_core
1
0
Fork 0
forked from boostorg/core
Code Pull Requests Activity

Merge pull request #40 from glenfe/develop

Browse Source 
Abort instead of assert if report_errors() not called
This commit is contained in:
Glen Fernandes
2018-09-04 20:25:11 -04:00
committed by GitHub
parent 3f7d36445d 30c006ac82
commit f2638b6d64
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/core/lightweight_test.hpp
View File

@ -23,10 +23,10 @@
// //
#include <boost/core/no_exceptions_support.hpp> #include <boost/core/no_exceptions_support.hpp>
#include <boost/assert.hpp>
#include <boost/current_function.hpp> #include <boost/current_function.hpp>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <cstdlib>
#include <cstring> #include <cstring>
#include <cstddef> #include <cstddef>
@ -45,11 +45,14 @@ namespace detail
class test_result { class test_result {
public: public:
test_result() test_result()
: report_errors_called_(false) : report_(false)
, errors_(0) { } , errors_(0) { }
~test_result() { ~test_result() {
BOOST_ASSERT(report_errors_called_); if (!report_) {
BOOST_LIGHTWEIGHT_TEST_OSTREAM << "report_errors() not called" << std::endl;
std::abort();
}
} }
void error() { void error() {
@ -57,12 +60,12 @@ public:
} }
int done() { int done() {
report_errors_called_ = true; report_ = true;
return errors_; return errors_;
} }
private: private:
bool report_errors_called_; bool report_;
int errors_; int errors_;
}; };
@ -382,7 +385,7 @@ inline int report_errors()
} // namespace boost } // namespace boost
#define BOOST_TEST(expr) ((expr)? (void)0: ::boost::detail::test_failed_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION)) #define BOOST_TEST(expr) ((expr)? (void)::boost::detail::test_results(): ::boost::detail::test_failed_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION))
#define BOOST_TEST_NOT(expr) BOOST_TEST(!(expr)) #define BOOST_TEST_NOT(expr) BOOST_TEST(!(expr))
#define BOOST_ERROR(msg) ( ::boost::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) ) #define BOOST_ERROR(msg) ( ::boost::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )