MachMultiprocess test: the child process must wait for the parent to finish

util/test/multiprocess.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "util/test/multiprocess.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/files/scoped_file.h"
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/misc/scoped_forbid_return.h"
 #include "util/test/errors.h"
 
 namespace crashpad {
 namespace test {
 
 using namespace testing;
@@ skipping 71 matching lines @@
       message =
           base::StringPrintf("Child terminated by signal %d (%s)%s, expected",
                              code,
                              strsignal(code),
                              WCOREDUMP(status) ? " (core dumped)" : "");
     } else {
       FAIL() << "Unknown termination reason";
     }
 
     if (reason_ == kTerminationNormal) {
-      message += base::StringPrintf("exit with code %d", code_);
+      message += base::StringPrintf(" exit with code %d", code_);
     } else if (reason == kTerminationSignal) {
-      message += base::StringPrintf("termination by signal %d", code_);
+      message += base::StringPrintf(" termination by signal %d", code_);
     }
 
     if (reason != reason_ || code != code_) {
       ADD_FAILURE() << message;
     }
   } else {
     RunChild();
   }
 }
 
@@ skipping 23 matching lines @@
 }
 
 pid_t Multiprocess::ChildPID() const {
   EXPECT_NE(0, info_->child_pid);
   return info_->child_pid;
 }
 
 int Multiprocess::ReadPipeFD() const {
   int fd = info_->child_pid ? info_->pipe_c2p_read.get()
                             : info_->pipe_p2c_read.get();
-  EXPECT_NE(-1, fd);
+  CHECK_NE(fd, -1);
   return fd;
 }
 
 int Multiprocess::WritePipeFD() const {
   int fd = info_->child_pid ? info_->pipe_p2c_write.get()
                             : info_->pipe_c2p_write.get();
-  EXPECT_NE(-1, fd);
+  CHECK_NE(fd, -1);
   return fd;
 }
 
+void Multiprocess::CloseReadPipe() {
+  if (info_->child_pid) {
+    info_->pipe_c2p_read.reset();
+  } else {
+    info_->pipe_p2c_read.reset();
+  }
+}
+
+void Multiprocess::CloseWritePipe() {
+  if (info_->child_pid) {
+    info_->pipe_p2c_write.reset();
+  } else {
+    info_->pipe_c2p_write.reset();
+  }
+}
+
 void Multiprocess::RunParent() {
   // The parent uses the read end of c2p and the write end of p2c.
   info_->pipe_c2p_write.reset();
   info_->pipe_p2c_read.reset();
 
   MultiprocessParent();
 
   info_->pipe_c2p_read.reset();
   info_->pipe_p2c_write.reset();
 }
@@ skipping 13 matching lines @@
   if (Test::HasFailure()) {
     // Trigger the ScopedForbidReturn destructor.
     return;
   }
 
   exit(0);
 }
 
 }  // namespace test
 }  // namespace crashpad