Merge branch 'master' into patch-1
This commit is contained in:
commit
99bb4fe85a
|
@ -983,6 +983,7 @@ static int ExecDeathTestChildMain(void* child_arg) {
|
|||
}
|
||||
# endif // !GTEST_OS_QNX
|
||||
|
||||
# if GTEST_HAS_CLONE
|
||||
// Two utility routines that together determine the direction the stack
|
||||
// grows.
|
||||
// This could be accomplished more elegantly by a single recursive
|
||||
|
@ -1007,6 +1008,7 @@ static bool StackGrowsDown() {
|
|||
StackLowerThanAddress(&dummy, &result);
|
||||
return result;
|
||||
}
|
||||
# endif // GTEST_HAS_CLONE
|
||||
|
||||
// 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
|
||||
|
|
Loading…
Reference in New Issue
Block a user