Add Multiprocess::SetExpectedChildTermination()

util/test/multiprocess.h

 // 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,
@@ skipping 17 matching lines @@
 
 //! \brief Manages a multiprocess test.
 //!
 //! These tests are `fork()`-based. The parent and child processes are able to
 //! communicate via a pair of POSIX pipes.
 //!
 //! Subclasses are expected to implement the parent and child by overriding the
 //! appropriate methods.
 class Multiprocess {
  public:
+  //! \brief The termination type for a child process.
+  enum TerminationReason : bool {
+    //! \brief The child terminated normally.
+    //!
+    //! A normal return happens when a test returns from RunChild(), or for
+    //! tests that `exec()`, returns from `main()`. This also happens for tests
+    //! that call `exit()` or `_exit()`.
+    kTerminationNormal = false,
+
+    //! \brief The child terminated by signal.
+    //!
+    //! Signal termination happens as a result of a crash, a call to `abort()`,
+    //! assertion failure (including gtest assertions), etc.
+    kTerminationSignal,
+  };
+
   Multiprocess();
 
   //! \brief Runs the test.
   //!
   //! This method establishes the proper testing environment by calling
   //! PreFork(), then calls `fork()`. In the parent process, it calls
   //! RunParent(), and in the child process, it calls RunChild().
   //!
   //! This method uses gtest assertions to validate the testing environment. If
   //! the testing environment cannot be set up properly, it is possible that
   //! MultiprocessParent() or MultiprocessChild() will not be called. In the
   //! parent process, this method also waits for the child process to exit after
-  //! MultiprocessParent() returns, and verifies that it exited cleanly without
-  //! raising any gtest assertions.
+  //! MultiprocessParent() returns, and verifies that it exited in accordance
+  //! with the expectations set by SetExpectedChildTermination().
   void Run();
 
+  //! \brief Sets the expected termination reason and code.
+  //!
+  //! The default expected termination reasaon is
+  //! TerminationReason::kTerminationNormal, and the default expected
+  //! termination code is `EXIT_SUCCESS` (`0`).
+  //!
+  //! \param[in] reason Whether to expect the child to terminate normally or
+  //!     as a result of a signal.
+  //! \param[in] code If \a reason is TerminationReason::kTerminationNormal,
+  //!     this is the expected exit status of the child. If \a reason is
+  //!     TerminationReason::kTerminationSignal, this is the signal that is
+  //!     expected to kill the child.
+  void SetExpectedChildTermination(TerminationReason reason, int code);
+
  protected:
   ~Multiprocess();
 
   //! \brief Establishes the proper testing environment prior to forking.
   //!
   //! Subclasses that solely implement a test should not need to override this
   //! method. Subclasses that do not implement tests but instead implement
   //! additional testing features on top of this class may override this method
   //! provided that they call the superclass’ implementation first as follows:
   //!
@@ skipping 59 matching lines @@
 
   //! \brief The subclass-provided child routine.
   //!
   //! Test failures should be reported via gtest: `EXPECT_*()`, `ASSERT_*()`,
   //! `FAIL()`, etc.
   //!
   //! Subclasses must implement this method to define how the child operates.
   virtual void MultiprocessChild() = 0;
 
   internal::MultiprocessInfo* info_;
+  int code_;

[Robert Sesek, 2014/09/09 20:42:44]

Flip the order of these two members to match the parameter order?

[Mark Mentovai, 2014/09/09 20:49:33]

rsesek wrote:
That’s worse for structure packing, do you insist?

[Robert Sesek, 2014/09/09 20:50:24]

No, but that's a pretty irrelevant argument for a test-only class IMO.

+  TerminationReason reason_;
 
   DISALLOW_COPY_AND_ASSIGN(Multiprocess);
 };
 
 }  // namespace test
 }  // namespace crashpad
 
 #endif  // CRASHPAD_UTIL_TEST_MULTIPROCESS_H_