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/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/test/launcher/unit_test_launcher.h" | 9 #include "base/test/launcher/unit_test_launcher.h" |
10 #include "base/test/test_io_thread.h" | 10 #include "base/test/test_io_thread.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #if defined(OS_ANDROID) | 27 #if defined(OS_ANDROID) |
28 // On android, the test framework has a signal handler that will print a | 28 // On android, the test framework has a signal handler that will print a |
29 // [ CRASH ] line when the application crashes. This breaks death test has the | 29 // [ CRASH ] line when the application crashes. This breaks death test has the |
30 // test runner will consider the death of the child process a test failure. | 30 // test runner will consider the death of the child process a test failure. |
31 // Removing the signal handler solves this issue. | 31 // Removing the signal handler solves this issue. |
32 signal(SIGABRT, SIG_DFL); | 32 signal(SIGABRT, SIG_DFL); |
33 #endif | 33 #endif |
34 | 34 |
35 base::TestSuite test_suite(argc, argv); | 35 base::TestSuite test_suite(argc, argv); |
36 | 36 |
37 // Must be run before mojo::edk::Init. | |
38 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
39 mojo::edk::test::kBrokerHandleSwitch)) { | |
40 mojo::edk::PreInitializeChildProcess(); | |
41 } | |
42 | |
43 // TODO(use_chrome_edk): temporary to force new EDK. | 37 // TODO(use_chrome_edk): temporary to force new EDK. |
44 base::CommandLine::ForCurrentProcess()->AppendSwitch("--use-new-edk"); | 38 base::CommandLine::ForCurrentProcess()->AppendSwitch("--use-new-edk"); |
45 | 39 |
46 mojo::edk::Init(); | 40 mojo::edk::Init(); |
47 | 41 |
48 mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl()); | 42 mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl()); |
49 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); | 43 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
50 // Leak this because its destructor calls mojo::edk::ShutdownIPCSupport which | 44 // Leak this because its destructor calls mojo::edk::ShutdownIPCSupport which |
51 // really does nothing in the new EDK but does depend on the current message | 45 // really does nothing in the new EDK but does depend on the current message |
52 // loop, which is destructed inside base::LaunchUnitTests. | 46 // loop, which is destructed inside base::LaunchUnitTests. |
53 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner()); | 47 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner()); |
54 | 48 |
55 return base::LaunchUnitTests( | 49 return base::LaunchUnitTests( |
56 argc, argv, | 50 argc, argv, |
57 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 51 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
58 } | 52 } |
OLD | NEW |