Skip to content

G
googletest
Unverified Commit 99bb4fe8 by Aleksey Kozin Committed by GitHub
Options

Merge branch 'master' into patch-1

parents 06568301 a490fb7a
Showing with 2 additions and 0 deletions
googletest/src/gtest-death-test.cc
...@@ -983,6 +983,7 @@ static int ExecDeathTestChildMain(void* child_arg) { ...@@ -983,6 +983,7 @@ static int ExecDeathTestChildMain(void* child_arg) {
} }
# endif // !GTEST_OS_QNX # endif // !GTEST_OS_QNX
# if GTEST_HAS_CLONE
// Two utility routines that together determine the direction the stack // Two utility routines that together determine the direction the stack
// grows. // grows.
// This could be accomplished more elegantly by a single recursive // This could be accomplished more elegantly by a single recursive
...@@ -1007,6 +1008,7 @@ static bool StackGrowsDown() { ...@@ -1007,6 +1008,7 @@ static bool StackGrowsDown() {
StackLowerThanAddress(&dummy, &result); StackLowerThanAddress(&dummy, &result);
return result; return result;
} }
# endif // GTEST_HAS_CLONE
// Spawns a child process with the same executable as the current process in // Spawns a child process with the same executable as the current process in
// a thread-safe manner and instructs it to run the death test. The // a thread-safe manner and instructs it to run the death test. The
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment