| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <signal.h> | 5 #include <signal.h> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/test/launcher/unit_test_launcher.h" | 8 #include "base/test/launcher/unit_test_launcher.h" |
| 9 #include "base/test/test_io_thread.h" |
| 9 #include "base/test/test_suite.h" | 10 #include "base/test/test_suite.h" |
| 10 #include "mojo/edk/embedder/test_embedder.h" | 11 #include "mojo/edk/embedder/test_embedder.h" |
| 12 #include "mojo/edk/test/scoped_ipc_support.h" |
| 11 #include "mojo/edk/test/test_support_impl.h" | 13 #include "mojo/edk/test/test_support_impl.h" |
| 12 #include "mojo/public/tests/test_support_private.h" | 14 #include "mojo/public/tests/test_support_private.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 16 |
| 15 int main(int argc, char** argv) { | 17 int main(int argc, char** argv) { |
| 16 #if !defined(OS_ANDROID) | 18 #if !defined(OS_ANDROID) |
| 17 // Silence death test thread warnings on Linux. We can afford to run our death | 19 // Silence death test thread warnings on Linux. We can afford to run our death |
| 18 // tests a little more slowly (< 10 ms per death test on a Z620). | 20 // tests a little more slowly (< 10 ms per death test on a Z620). |
| 19 // On android, we need to run in the default mode, as the threadsafe mode | 21 // On android, we need to run in the default mode, as the threadsafe mode |
| 20 // relies on execve which is not available. | 22 // relies on execve which is not available. |
| 21 testing::GTEST_FLAG(death_test_style) = "threadsafe"; | 23 testing::GTEST_FLAG(death_test_style) = "threadsafe"; |
| 22 #endif | 24 #endif |
| 23 #if defined(OS_ANDROID) | 25 #if defined(OS_ANDROID) |
| 24 // On android, the test framework has a signal handler that will print a | 26 // On android, the test framework has a signal handler that will print a |
| 25 // [ CRASH ] line when the application crashes. This breaks death test has the | 27 // [ CRASH ] line when the application crashes. This breaks death test has the |
| 26 // test runner will consider the death of the child process a test failure. | 28 // test runner will consider the death of the child process a test failure. |
| 27 // Removing the signal handler solves this issue. | 29 // Removing the signal handler solves this issue. |
| 28 signal(SIGABRT, SIG_DFL); | 30 signal(SIGABRT, SIG_DFL); |
| 29 #endif | 31 #endif |
| 30 | 32 |
| 31 base::TestSuite test_suite(argc, argv); | 33 base::TestSuite test_suite(argc, argv); |
| 32 | 34 |
| 33 mojo::embedder::test::InitWithSimplePlatformSupport(); | 35 mojo::edk::test::InitWithSimplePlatformSupport(); |
| 34 mojo::test::TestSupport::Init(new mojo::test::TestSupportImpl()); | 36 mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl()); |
| 37 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
| 38 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); |
| 35 | 39 |
| 36 return base::LaunchUnitTests( | 40 return base::LaunchUnitTests( |
| 37 argc, argv, | 41 argc, argv, |
| 38 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 42 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
| 39 } | 43 } |
| OLD | NEW |