Index: mojo/edk/test/run_all_unittests.cc |
diff --git a/mojo/edk/test/run_all_unittests.cc b/mojo/edk/test/run_all_unittests.cc |
index 0afc2ffaa06da5f097f90a13e2fc08cd0fbaabd2..05aed913a4868f2fa2ae443e1c9098a44ab23ade 100644 |
--- a/mojo/edk/test/run_all_unittests.cc |
+++ b/mojo/edk/test/run_all_unittests.cc |
@@ -7,6 +7,7 @@ |
#include "base/bind.h" |
#include "base/command_line.h" |
#include "base/test/launcher/unit_test_launcher.h" |
+#include "base/test/multiprocess_test.h" |
#include "base/test/test_io_thread.h" |
#include "base/test/test_suite.h" |
#include "mojo/edk/embedder/embedder.h" |
@@ -25,6 +26,10 @@ int main(int argc, char** argv) { |
testing::GTEST_FLAG(death_test_style) = "threadsafe"; |
#endif |
#if defined(OS_ANDROID) |
+ // Enable the alternate test child implementation. This is needed because Mojo |
+ // tests need to spawn test children after initialising the Mojo system. |
+ base::InitAndroidMultiProcessTestHelper(main); |
+ |
// On android, the test framework has a signal handler that will print a |
// [ CRASH ] line when the application crashes. This breaks death test has the |
// test runner will consider the death of the child process a test failure. |