3 files changed, 7 insertions, 3 deletions
diff --git a/src/common/linux/elf_core_dump_unittest.cc b/src/common/linux/elf_core_dump_unittest.cc
index 89496ab9..11920f25 100644
--- a/src/common/linux/elf_core_dump_unittest.cc
+++ b/src/common/linux/elf_core_dump_unittest.cc
@@ -141,7 +141,7 @@ TEST(ElfCoreDumpTest, ValidCoreFile) {
   // TODO(benchan): Revert to use ASSERT_TRUE once the flakiness in
   // CrashGenerator is identified and fixed.
   if (!crash_generator.CreateChildCrash(kNumOfThreads, kCrashThread,
-                                        kCrashSignal)) {
+                                        kCrashSignal, NULL)) {
     fprintf(stderr, "ElfCoreDumpTest.ValidCoreFile test is skipped "
             "due to no core dump generated");
     return;
diff --git a/src/common/linux/tests/crash_generator.cc b/src/common/linux/tests/crash_generator.cc
index fd96e6ca..7274acf9 100644
--- a/src/common/linux/tests/crash_generator.cc
+++ b/src/common/linux/tests/crash_generator.cc
@@ -144,7 +144,8 @@ bool CrashGenerator::SetCoreFileSizeLimit(rlim_t limit) const {
 }
 
 bool CrashGenerator::CreateChildCrash(
-    unsigned num_threads, unsigned crash_thread, int crash_signal) {
+    unsigned num_threads, unsigned crash_thread, int crash_signal,
+    pid_t* child_pid) {
   if (num_threads == 0 || crash_thread >= num_threads)
     return false;
 
@@ -178,6 +179,9 @@ bool CrashGenerator::CreateChildCrash(
     perror("CrashGenerator: Child process not killed by the expected signal");
     return false;
   }
+
+  if (child_pid)
+    *child_pid = pid;
   return true;
 }
 
diff --git a/src/common/linux/tests/crash_generator.h b/src/common/linux/tests/crash_generator.h
index c88a8920..874b15cd 100644
--- a/src/common/linux/tests/crash_generator.h
+++ b/src/common/linux/tests/crash_generator.h
@@ -70,7 +70,7 @@ class CrashGenerator {
   // a signal with number |crash_signal| to the |crash_thread|-th thread.
   // Returns true on success.
   bool CreateChildCrash(unsigned num_threads, unsigned crash_thread,
-                        int crash_signal);
+                        int crash_signal, pid_t* child_pid);
 
   // Creates |num_threads| threads in the child process.
   void CreateThreadsInChildProcess(unsigned num_threads);