From bc427731cc4891facbda560f036c8a22f9944873 Mon Sep 17 00:00:00 2001 From: Raffi Enficiaud Date: Mon, 30 Jan 2017 20:53:03 +0100 Subject: [PATCH] Fix tests issues --- include/boost/test/impl/unit_test_log.ipp | 2 +- .../boost/test/impl/unit_test_parameters.ipp | 8 +-- include/boost/test/unit_test_parameters.hpp | 53 ++++++++++--------- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/include/boost/test/impl/unit_test_log.ipp b/include/boost/test/impl/unit_test_log.ipp index 8bf933fd..c9c7aba7 100644 --- a/include/boost/test/impl/unit_test_log.ipp +++ b/include/boost/test/impl/unit_test_log.ipp @@ -168,7 +168,7 @@ unit_test_log_t::test_start( counter_t test_cases_amount ) current_logger_data.m_log_formatter->log_start( current_logger_data.stream(), test_cases_amount ); - if( runtime_config::get( runtime_config::btrt_build_info_str ) ) + if( runtime_config::get( runtime_config::btrt_build_info ) ) current_logger_data.m_log_formatter->log_build_info( current_logger_data.stream() ); current_logger_data.m_entry_in_progress = false; diff --git a/include/boost/test/impl/unit_test_parameters.ipp b/include/boost/test/impl/unit_test_parameters.ipp index 0dbb072a..b825c46d 100644 --- a/include/boost/test/impl/unit_test_parameters.ipp +++ b/include/boost/test/impl/unit_test_parameters.ipp @@ -73,7 +73,7 @@ namespace runtime_config { // UTF parameters std::string btrt_auto_start_dbg = "auto_start_dbg"; std::string btrt_break_exec_path = "break_exec_path"; -std::string btrt_build_info_str = "build_info"; +std::string btrt_build_info = "build_info"; std::string btrt_catch_sys_errors = "catch_system_errors"; std::string btrt_color_output = "color_output"; std::string btrt_detect_fp_except = "detect_fp_exceptions"; @@ -142,14 +142,14 @@ register_parameters( rt::parameters_store& store ) /////////////////////////////////////////////// - rt::option build_info( btrt_build_info_str, ( + rt::option build_info( btrt_build_info, ( rt::description = "Displays library build information.", rt::env_var = "BOOST_TEST_BUILD_INFO", - rt::help = "Option " + btrt_build_info_str + " displays library build information, including: platform, " + rt::help = "Option " + btrt_build_info + " displays library build information, including: platform, " "compiler, STL version and Boost version." )); - build_info.add_cla_id( "--", btrt_build_info_str, "=" ); + build_info.add_cla_id( "--", btrt_build_info, "=" ); build_info.add_cla_id( "-", "i", " " ); store.add( build_info ); diff --git a/include/boost/test/unit_test_parameters.hpp b/include/boost/test/unit_test_parameters.hpp index 4ac4eaee..0b77f371 100644 --- a/include/boost/test/unit_test_parameters.hpp +++ b/include/boost/test/unit_test_parameters.hpp @@ -36,31 +36,34 @@ namespace runtime_config { // ************************************************************************** // // UTF parameters -BOOST_TEST_DECL extern std::string AUTO_START_DBG; -BOOST_TEST_DECL extern std::string BREAK_EXEC_PATH; -BOOST_TEST_DECL extern std::string BUILD_INFO; -BOOST_TEST_DECL extern std::string CATCH_SYS_ERRORS; -BOOST_TEST_DECL extern std::string COLOR_OUTPUT; -BOOST_TEST_DECL extern std::string DETECT_FP_EXCEPT; -BOOST_TEST_DECL extern std::string DETECT_MEM_LEAKS; -BOOST_TEST_DECL extern std::string LIST_CONTENT; -BOOST_TEST_DECL extern std::string LIST_LABELS; -BOOST_TEST_DECL extern std::string COMBINED_LOGGER; -BOOST_TEST_DECL extern std::string LOG_FORMAT; -BOOST_TEST_DECL extern std::string LOG_LEVEL; -BOOST_TEST_DECL extern std::string LOG_SINK; -BOOST_TEST_DECL extern std::string OUTPUT_FORMAT; -BOOST_TEST_DECL extern std::string RANDOM_SEED; -BOOST_TEST_DECL extern std::string REPORT_FORMAT; -BOOST_TEST_DECL extern std::string REPORT_LEVEL; -BOOST_TEST_DECL extern std::string REPORT_MEM_LEAKS; -BOOST_TEST_DECL extern std::string REPORT_SINK; -BOOST_TEST_DECL extern std::string RESULT_CODE; -BOOST_TEST_DECL extern std::string RUN_FILTERS; -BOOST_TEST_DECL extern std::string SAVE_TEST_PATTERN; -BOOST_TEST_DECL extern std::string SHOW_PROGRESS; -BOOST_TEST_DECL extern std::string USE_ALT_STACK; -BOOST_TEST_DECL extern std::string WAIT_FOR_DEBUGGER; +BOOST_TEST_DECL extern std::string btrt_auto_start_dbg; +BOOST_TEST_DECL extern std::string btrt_break_exec_path; +BOOST_TEST_DECL extern std::string btrt_build_info; +BOOST_TEST_DECL extern std::string btrt_catch_sys_errors; +BOOST_TEST_DECL extern std::string btrt_color_output; +BOOST_TEST_DECL extern std::string btrt_detect_fp_except; +BOOST_TEST_DECL extern std::string btrt_detect_mem_leaks; +BOOST_TEST_DECL extern std::string btrt_list_content; +BOOST_TEST_DECL extern std::string btrt_list_labels; +BOOST_TEST_DECL extern std::string btrt_log_format; +BOOST_TEST_DECL extern std::string btrt_log_level; +BOOST_TEST_DECL extern std::string btrt_log_sink; +BOOST_TEST_DECL extern std::string btrt_combined_logger; +BOOST_TEST_DECL extern std::string btrt_output_format; +BOOST_TEST_DECL extern std::string btrt_random_seed; +BOOST_TEST_DECL extern std::string btrt_report_format; +BOOST_TEST_DECL extern std::string btrt_report_level; +BOOST_TEST_DECL extern std::string btrt_report_mem_leaks; +BOOST_TEST_DECL extern std::string btrt_report_sink; +BOOST_TEST_DECL extern std::string btrt_result_code; +BOOST_TEST_DECL extern std::string btrt_run_filters; +BOOST_TEST_DECL extern std::string btrt_save_test_pattern; +BOOST_TEST_DECL extern std::string btrt_show_progress; +BOOST_TEST_DECL extern std::string btrt_use_alt_stack; +BOOST_TEST_DECL extern std::string btrt_wait_for_debugger; +BOOST_TEST_DECL extern std::string btrt_help; +BOOST_TEST_DECL extern std::string btrt_usage; +BOOST_TEST_DECL extern std::string btrt_version; BOOST_TEST_DECL void init( int& argc, char** argv );