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
6c73adfc
Unverified
Commit
6c73adfc
authored
Mar 02, 2018
by
Gennadiy Civil
Committed by
GitHub
Mar 02, 2018
Browse files
Merge pull request #1486 from petrhosek/json-stacktrace
Use a full message in the JSON output for failures
parents
447d58b4
7a2050d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
googletest/src/gtest.cc
googletest/src/gtest.cc
+2
-2
No files found.
googletest/src/gtest.cc
View file @
6c73adfc
...
...
@@ -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
<<
" }"
;
}
...
...
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