gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiple \n characters in xml file when using GTEST_SKIP.

Browse Source
This commit is contained in:
Mario Voorsluys 2020-03-26 19:14:32 +01:00
parent d28d05cc64
commit 23dadb8472
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
googletest/src/gtest.cc
View File

@ -2191,7 +2191,9 @@ std::string AppendUserMessage(const std::string& gtest_msg,
if (user_msg_string.empty()) { if (user_msg_string.empty()) {
return gtest_msg; return gtest_msg;
} }
if (gtest_msg.empty()) {
return user_msg_string;
}
return gtest_msg + "\n" + user_msg_string; return gtest_msg + "\n" + user_msg_string;
} }
@ -3113,7 +3115,7 @@ static std::string FormatTestSuiteCount(int test_suite_count) {
static const char * TestPartResultTypeToString(TestPartResult::Type type) { static const char * TestPartResultTypeToString(TestPartResult::Type type) {
switch (type) { switch (type) {
case TestPartResult::kSkip: case TestPartResult::kSkip:
return "Skipped"; return "Skipped\n";
case TestPartResult::kSuccess: case TestPartResult::kSuccess:
return "Success"; return "Success";