diff options
Diffstat (limited to 'boost/test/impl/compiler_log_formatter.ipp')
| -rw-r--r-- | boost/test/impl/compiler_log_formatter.ipp | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/boost/test/impl/compiler_log_formatter.ipp b/boost/test/impl/compiler_log_formatter.ipp index c1ed944ab1..c5aa6afe93 100644 --- a/boost/test/impl/compiler_log_formatter.ipp +++ b/boost/test/impl/compiler_log_formatter.ipp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2014. +// (C) Copyright Gennadiy Rozental 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,14 +16,18 @@ #define BOOST_TEST_COMPILER_LOG_FORMATTER_IPP_020105GER // Boost.Test +#include <boost/test/output/compiler_log_formatter.hpp> + #include <boost/test/framework.hpp> #include <boost/test/execution_monitor.hpp> +#include <boost/test/unit_test_parameters.hpp> + #include <boost/test/tree/test_unit.hpp> + #include <boost/test/utils/basic_cstring/io.hpp> #include <boost/test/utils/lazy_ostream.hpp> #include <boost/test/utils/setcolor.hpp> -#include <boost/test/output/compiler_log_formatter.hpp> -#include <boost/test/unit_test_parameters.hpp> + // Boost #include <boost/version.hpp> @@ -58,6 +62,8 @@ test_phase_identifier() void compiler_log_formatter::log_start( std::ostream& output, counter_t test_cases_amount ) { + m_color_output = runtime_config::get<bool>( runtime_config::COLOR_OUTPUT ); + if( test_cases_amount > 0 ) output << "Running " << test_cases_amount << " test " << (test_cases_amount > 1 ? "cases" : "case") << "...\n"; @@ -89,7 +95,7 @@ compiler_log_formatter::log_build_info( std::ostream& output ) void compiler_log_formatter::test_unit_start( std::ostream& output, test_unit const& tu ) { - BOOST_TEST_SCOPE_SETCOLOR( output, term_attr::BRIGHT, term_color::BLUE ); + BOOST_TEST_SCOPE_SETCOLOR( m_color_output, output, term_attr::BRIGHT, term_color::BLUE ); print_prefix( output, tu.p_file_name, tu.p_line_num ); @@ -101,7 +107,7 @@ compiler_log_formatter::test_unit_start( std::ostream& output, test_unit const& void compiler_log_formatter::test_unit_finish( std::ostream& output, test_unit const& tu, unsigned long elapsed ) { - BOOST_TEST_SCOPE_SETCOLOR( output, term_attr::BRIGHT, term_color::BLUE ); + BOOST_TEST_SCOPE_SETCOLOR( m_color_output, output, term_attr::BRIGHT, term_color::BLUE ); print_prefix( output, tu.p_file_name, tu.p_line_num ); @@ -123,7 +129,7 @@ compiler_log_formatter::test_unit_finish( std::ostream& output, test_unit const& void compiler_log_formatter::test_unit_skipped( std::ostream& output, test_unit const& tu, const_string reason ) { - BOOST_TEST_SCOPE_SETCOLOR( output, term_attr::BRIGHT, term_color::YELLOW ); + BOOST_TEST_SCOPE_SETCOLOR( m_color_output, output, term_attr::BRIGHT, term_color::YELLOW ); print_prefix( output, tu.p_file_name, tu.p_line_num ); @@ -140,7 +146,7 @@ compiler_log_formatter::log_exception_start( std::ostream& output, log_checkpoin print_prefix( output, loc.m_file_name, loc.m_line_num ); { - BOOST_TEST_SCOPE_SETCOLOR( output, term_attr::BLINK, term_color::RED ); + BOOST_TEST_SCOPE_SETCOLOR( m_color_output, output, term_attr::BLINK, term_color::RED ); output << "fatal error: in \"" << (loc.m_function.is_empty() ? test_phase_identifier() : loc.m_function ) << "\": " << ex.what(); @@ -150,7 +156,7 @@ compiler_log_formatter::log_exception_start( std::ostream& output, log_checkpoin output << '\n'; print_prefix( output, checkpoint_data.m_file_name, checkpoint_data.m_line_num ); - BOOST_TEST_SCOPE_SETCOLOR( output, term_attr::BRIGHT, term_color::CYAN ); + BOOST_TEST_SCOPE_SETCOLOR( m_color_output, output, term_attr::BRIGHT, term_color::CYAN ); output << "last checkpoint"; if( !checkpoint_data.m_message.empty() ) @@ -171,32 +177,34 @@ compiler_log_formatter::log_exception_finish( std::ostream& output ) void compiler_log_formatter::log_entry_start( std::ostream& output, log_entry_data const& entry_data, log_entry_types let ) { + using namespace utils; + switch( let ) { case BOOST_UTL_ET_INFO: print_prefix( output, entry_data.m_file_name, entry_data.m_line_num ); - if( runtime_config::color_output() ) + if( m_color_output ) output << setcolor( term_attr::BRIGHT, term_color::GREEN ); output << "info: "; break; case BOOST_UTL_ET_MESSAGE: - if( runtime_config::color_output() ) + if( m_color_output ) output << setcolor( term_attr::BRIGHT, term_color::CYAN ); break; case BOOST_UTL_ET_WARNING: print_prefix( output, entry_data.m_file_name, entry_data.m_line_num ); - if( runtime_config::color_output() ) + if( m_color_output ) output << setcolor( term_attr::BRIGHT, term_color::YELLOW ); output << "warning: in \"" << test_phase_identifier() << "\": "; break; case BOOST_UTL_ET_ERROR: print_prefix( output, entry_data.m_file_name, entry_data.m_line_num ); - if( runtime_config::color_output() ) + if( m_color_output ) output << setcolor( term_attr::BRIGHT, term_color::RED ); output << "error: in \"" << test_phase_identifier() << "\": "; break; case BOOST_UTL_ET_FATAL_ERROR: print_prefix( output, entry_data.m_file_name, entry_data.m_line_num ); - if( runtime_config::color_output() ) + if( m_color_output ) output << setcolor( term_attr::BLINK, term_color::RED ); output << "fatal error: in \"" << test_phase_identifier() << "\": "; break; @@ -224,8 +232,8 @@ compiler_log_formatter::log_entry_value( std::ostream& output, lazy_ostream cons void compiler_log_formatter::log_entry_finish( std::ostream& output ) { - if( runtime_config::color_output() ) - output << setcolor(); + if( m_color_output ) + output << utils::setcolor(); output << std::endl; } @@ -236,8 +244,7 @@ compiler_log_formatter::log_entry_finish( std::ostream& output ) void compiler_log_formatter::print_prefix( std::ostream& output, const_string file_name, std::size_t line_num ) { - if( !file_name.empty() ) - { + if( !file_name.empty() ) { #ifdef __APPLE_CC__ // Xcode-compatible logging format, idea by Richard Dingwall at // <http://richarddingwall.name/2008/06/01/using-the-boost-unit-test-framework-with-xcode-3/>. |