Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
23dadb84
Commit
23dadb84
authored
Mar 26, 2020
by
Mario Voorsluys
Browse files
Fix multiple \n characters in xml file when using GTEST_SKIP.
parent
d28d05cc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
googletest/src/gtest.cc
googletest/src/gtest.cc
+4
-2
No files found.
googletest/src/gtest.cc
View file @
23dadb84
...
@@ -2191,7 +2191,9 @@ std::string AppendUserMessage(const std::string& gtest_msg,
...
@@ -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) {
...
@@ -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"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment