Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
33596cb5
Unverified
Commit
33596cb5
authored
Aug 09, 2018
by
Gennadiy Civil
Committed by
GitHub
Aug 09, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1721 from gennadiycivil/master
Fixing identation, causes build errors when warnings are treated as errors
parents
2797ba8f
7a79459a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
gtest-death-test.cc
googletest/src/gtest-death-test.cc
+6
-3
No files found.
googletest/src/gtest-death-test.cc
View file @
33596cb5
...
@@ -233,11 +233,14 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
...
@@ -233,11 +233,14 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
Message
msg
;
Message
msg
;
msg
<<
"Death tests use fork(), which is unsafe particularly"
msg
<<
"Death tests use fork(), which is unsafe particularly"
<<
" in a threaded context. For this test, "
<<
GTEST_NAME_
<<
" "
;
<<
" in a threaded context. For this test, "
<<
GTEST_NAME_
<<
" "
;
if
(
thread_count
==
0
)
if
(
thread_count
==
0
)
{
msg
<<
"couldn't detect the number of threads."
;
msg
<<
"couldn't detect the number of threads."
;
else
}
else
{
msg
<<
"detected "
<<
thread_count
<<
" threads."
;
msg
<<
"detected "
<<
thread_count
<<
" threads."
;
msg
<<
" See https://github.com/google/googletest/blob/master/googletest/docs/advanced.md#death-tests-and-threads"
}
msg
<<
" See "
"https://github.com/google/googletest/blob/master/googletest/docs/"
"advanced.md#death-tests-and-threads"
<<
" for more explanation and suggested solutions, especially if"
<<
" for more explanation and suggested solutions, especially if"
<<
" this is the last message you see before your test times out."
;
<<
" this is the last message you see before your test times out."
;
return
msg
.
GetString
();
return
msg
.
GetString
();
...
...
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