aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-04-25 11:21:45 +0000
committerted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-04-25 11:21:45 +0000
commit258f2459fcd0621bb84f50833c8348e08ec6fa4f (patch)
tree8ff488b53fb4113fec4016ca7c9c86a6011746b1 /src
parentMake Breakpad build with DSO linking on newer versions of Fedora/Ubuntu. (diff)
downloadbreakpad-258f2459fcd0621bb84f50833c8348e08ec6fa4f.tar.xz
Reap child in VerifyStackReadWithMultipleThreads
Patch by Chris Dearman <chris@mips.com> R=benchan at http://breakpad.appspot.com/378001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@956 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src')
-rw-r--r--src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
index 5f7995c1..a1665082 100644
--- a/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+++ b/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
@@ -252,7 +252,14 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
4);
EXPECT_EQ(dumper.threads()[i], one_thread_id);
}
+ EXPECT_TRUE(dumper.ThreadsResume());
kill(child_pid, SIGKILL);
+
+ // Reap child
+ int status;
+ ASSERT_NE(-1, HANDLE_EINTR(waitpid(child_pid, &status, 0)));
+ ASSERT_TRUE(WIFSIGNALED(status));
+ ASSERT_EQ(SIGKILL, WTERMSIG(status));
}
TEST(LinuxPtraceDumperTest, BuildProcPath) {