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
8497540f
Commit
8497540f
authored
May 03, 2018
by
Fabrice de Gans-Riberi
Browse files
Fix comments
parent
13af91fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
googletest/src/gtest-death-test.cc
googletest/src/gtest-death-test.cc
+5
-5
googletest/src/gtest-port.cc
googletest/src/gtest-port.cc
+1
-1
No files found.
googletest/src/gtest-death-test.cc
View file @
8497540f
...
...
@@ -135,8 +135,8 @@ static bool g_in_fast_death_test_child = false;
bool
InDeathTestChild
()
{
# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
// On Windows, death tests are thread-safe regardless of the value
of the
// death_test_style flag.
// On Windows
and Fuchsia
, death tests are thread-safe regardless of the value
//
of the
death_test_style flag.
return
!
GTEST_FLAG
(
internal_run_death_test
).
empty
();
# else
...
...
@@ -164,7 +164,7 @@ bool ExitedWithCode::operator()(int exit_status) const {
return
WIFEXITED
(
exit_status
)
&&
WEXITSTATUS
(
exit_status
)
==
exit_code_
;
# endif // GTEST_OS_WINDOWS
# endif // GTEST_OS_WINDOWS
|| GTEST_OS_FUCHSIA
}
# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
...
...
@@ -211,7 +211,7 @@ static std::string ExitSummary(int exit_code) {
m
<<
" (core dumped)"
;
}
# endif
# endif // GTEST_OS_WINDOWS
# endif // GTEST_OS_WINDOWS
|| GTEST_OS_FUCHSIA
return
m
.
GetString
();
}
...
...
@@ -237,7 +237,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
msg
<<
"detected "
<<
thread_count
<<
" threads."
;
return
msg
.
GetString
();
}
# endif // !GTEST_OS_WINDOWS
# endif // !GTEST_OS_WINDOWS
&& !GTEST_OS_FUCHSIA
// Flag characters for reporting a death test that did not die.
static
const
char
kDeathTestLived
=
'L'
;
...
...
googletest/src/gtest-port.cc
View file @
8497540f
...
...
@@ -66,7 +66,7 @@
#if GTEST_OS_FUCHSIA
# include <zircon/process.h>
# include <zircon/syscalls.h>
#endif
#endif
// GTEST_OS_FUCHSIA
#include "gtest/gtest-spi.h"
#include "gtest/gtest-message.h"
...
...
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