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
54cb8b02
Commit
54cb8b02
authored
Aug 09, 2018
by
Gennadiy Civil
Browse files
Merge branch 'master' of github.com:gennadiycivil/googletest
parents
f7042937
d5b31df9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
googletest/src/gtest-death-test.cc
googletest/src/gtest-death-test.cc
+1
-2
No files found.
googletest/src/gtest-death-test.cc
View file @
54cb8b02
...
...
@@ -244,8 +244,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
<<
" for more explanation and suggested solutions, especially if"
<<
" this is the last message you see before your test times out."
;
return
msg
.
GetString
();
}
# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
}
#
endif
// !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
// Flag characters for reporting a death test that did not die.
static
const
char
kDeathTestLived
=
'L'
;
...
...
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