From 23dadb8472d9a124394d9d77a659d565e5ea2d93 Mon Sep 17 00:00:00 2001
From: Mario Voorsluys <mvoorsluys@lely.com>
Date: Thu, 26 Mar 2020 19:14:32 +0100
Subject: [PATCH] Fix multiple \n characters in xml file when using GTEST_SKIP.

---
 googletest/src/gtest.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index d6aef6ad..75d80153 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -2191,7 +2191,9 @@ std::string AppendUserMessage(const std::string& gtest_msg,
   if (user_msg_string.empty()) {
     return gtest_msg;
   }
-
+  if (gtest_msg.empty()) {
+    return 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) {
   switch (type) {
     case TestPartResult::kSkip:
-      return "Skipped";
+      return "Skipped\n";
     case TestPartResult::kSuccess:
       return "Success";