diff options
author | Gennadiy Civil <misterg@google.com> | 2018-02-12 19:07:45 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-02-12 19:07:45 (GMT) |
commit | d84f58ab1085802388e240ed3ac072cd86bf5523 (patch) | |
tree | 395172fc03d50aecc5b1b8709f6cf943c994b6fc /googletest/src/gtest-death-test.cc | |
parent | 575c08122741dae18673f612d7b8dca46c27432b (diff) | |
download | googletest-d84f58ab1085802388e240ed3ac072cd86bf5523.zip googletest-d84f58ab1085802388e240ed3ac072cd86bf5523.tar.gz googletest-d84f58ab1085802388e240ed3ac072cd86bf5523.tar.bz2 |
Merging, coniniue
Diffstat (limited to 'googletest/src/gtest-death-test.cc')
-rw-r--r-- | googletest/src/gtest-death-test.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 00e231b..92a2980 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -983,7 +983,6 @@ 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 @@ -1008,7 +1007,6 @@ 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 @@ -1225,11 +1223,11 @@ bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex, // signals the event, and returns a file descriptor wrapped around the pipe // handle. This function is called in the child process only. static int GetStatusFileDescriptor(unsigned int parent_process_id, - size_t write_handle_as_size_t, - size_t event_handle_as_size_t) { + size_t write_handle_as_size_t, + size_t event_handle_as_size_t) { AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE, - FALSE, // Non-inheritable. - parent_process_id)); + FALSE, // Non-inheritable. + parent_process_id)); if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) { DeathTestAbort("Unable to open parent process " + StreamableToString(parent_process_id)); |