aboutsummaryrefslogtreecommitdiffstats
path: root/src/gtest.cc
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-02-02 10:07:04 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-02-02 10:07:04 +0000
commit9d7455f9844e293dff8b7902f0c2553094f2f976 (patch)
treedfb2f65d0932332b217c19dd22ed62d18e70e2c9 /src/gtest.cc
parent40d0ba7a62a8bc749fbaf0747621b0aa10ddf1b9 (diff)
downloadgoogletest-9d7455f9844e293dff8b7902f0c2553094f2f976.tar.gz
googletest-9d7455f9844e293dff8b7902f0c2553094f2f976.tar.bz2
googletest-9d7455f9844e293dff8b7902f0c2553094f2f976.zip
Adds null check for file locations in XML output printer.
Diffstat (limited to 'src/gtest.cc')
-rw-r--r--src/gtest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gtest.cc b/src/gtest.cc
index 575a8a5f..1c58c6fd 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -3245,8 +3245,9 @@ void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
<< EscapeXmlAttribute(part.summary()).c_str()
<< "\" type=\"\">";
const String message = RemoveInvalidXmlCharacters(String::Format(
- "%s:%d\n%s",
- part.file_name(), part.line_number(),
+ "%s\n%s",
+ internal::FormatCompilerIndependentFileLocation(
+ part.file_name(), part.line_number()).c_str(),
part.message()).c_str());
OutputXmlCDataSection(stream, message.c_str());
*stream << "</failure>\n";