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
61799bd5
Unverified
Commit
61799bd5
authored
Aug 08, 2018
by
Gennadiy Civil
Committed by
GitHub
Aug 08, 2018
Browse files
Merge pull request #1710 from gennadiycivil/master
Formatting Changes and small code merge
parents
d5266326
d31266e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
googletest/src/gtest-death-test.cc
googletest/src/gtest-death-test.cc
+3
-0
googletest/src/gtest.cc
googletest/src/gtest.cc
+1
-0
No files found.
googletest/src/gtest-death-test.cc
View file @
61799bd5
...
@@ -237,6 +237,9 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
...
@@ -237,6 +237,9 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
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"
<<
" for more explanation and suggested solutions, especially if"
<<
" this is the last message you see before your test times out."
;
return
msg
.
GetString
();
return
msg
.
GetString
();
}
}
# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
...
...
googletest/src/gtest.cc
View file @
61799bd5
...
@@ -3138,6 +3138,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart(
...
@@ -3138,6 +3138,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart(
"Note: Randomizing tests' orders with a seed of %d .
\n
"
,
"Note: Randomizing tests' orders with a seed of %d .
\n
"
,
unit_test
.
random_seed
());
unit_test
.
random_seed
());
}
}
ColoredPrintf
(
COLOR_GREEN
,
"[==========] "
);
ColoredPrintf
(
COLOR_GREEN
,
"[==========] "
);
printf
(
"Running %s from %s.
\n
"
,
printf
(
"Running %s from %s.
\n
"
,
FormatTestCount
(
unit_test
.
test_to_run_count
()).
c_str
(),
FormatTestCount
(
unit_test
.
test_to_run_count
()).
c_str
(),
...
...
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