Merge branch 'master' into unsigned-wchar

This commit is contained in:
Gennadiy Civil 2018-03-05 10:43:19 -05:00 committed by GitHub
commit 829a8c966b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4012,9 +4012,9 @@ void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
const std::string location =
internal::FormatCompilerIndependentFileLocation(part.file_name(),
part.line_number());
const std::string summary = EscapeJson(location + "\n" + part.summary());
const std::string message = EscapeJson(location + "\n" + part.message());
*stream << kIndent << " {\n"
<< kIndent << " \"failure\": \"" << summary << "\",\n"
<< kIndent << " \"failure\": \"" << message << "\",\n"
<< kIndent << " \"type\": \"\"\n"
<< kIndent << " }";
}