From 57ed6da22501152b376ff25f9a589d33203a952b Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sat, 22 Mar 2014 16:01:40 -0700 Subject: [PATCH] Make explicit char * -> string conversion in test helper The version of clang on travis-ci seems to not allow this conversion to be made implicitly --- spec/runtime/helpers/read_test_entries.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/spec/runtime/helpers/read_test_entries.cc b/spec/runtime/helpers/read_test_entries.cc index 61ac1217..58b47b27 100644 --- a/spec/runtime/helpers/read_test_entries.cc +++ b/spec/runtime/helpers/read_test_entries.cc @@ -15,17 +15,16 @@ using std::regex_replace; static string trim_output(const string &input) { string result(input); - result = regex_replace(result, regex("^[\\s]+"), ""); - result = regex_replace(result, regex("[\\s]+$"), ""); - result = regex_replace(result, regex("\\)\\s+\\)"), "))"); - result = regex_replace(result, regex("\\s+"), " "); + result = regex_replace(result, regex("[\n\t ]+", std::regex_constants::extended), string(" ")); + result = regex_replace(result, regex("^ ", std::regex_constants::extended), string("")); + result = regex_replace(result, regex(" $", std::regex_constants::extended), string("")); + result = regex_replace(result, regex("\\) \\)", std::regex_constants::extended), string("))")); return result; } static vector get_test_entries_from_string(string content) { - regex header_pattern("===+\n" "([^=]+)\n" "===+\n"); - regex separator_pattern("---+"); - + regex header_pattern("===+\n" "([^=]+)\n" "===+", std::regex_constants::extended); + regex separator_pattern("---+", std::regex_constants::extended); vector descriptions; vector bodies;