diff options
| author | Aleksey Kozin <cirnotoss@gmail.com> | 2018-02-23 01:38:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 01:38:54 +0300 |
| commit | 99bb4fe85a20a05535104330d31beac7e994be5c (patch) | |
| tree | a7bc73af6a01397584c3bdddee10cdbc4dde6d6f | |
| parent | 06568301ec4adcdce318e4cf717e075c48fc05a5 (diff) | |
| parent | a490fb7a9a00d62e03d84e85e3e07ed127a21ef8 (diff) | |
| download | googletest-99bb4fe85a20a05535104330d31beac7e994be5c.tar.gz googletest-99bb4fe85a20a05535104330d31beac7e994be5c.tar.bz2 googletest-99bb4fe85a20a05535104330d31beac7e994be5c.zip | |
Merge branch 'master' into patch-1
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 92a29806..852912b5 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -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 |