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 <algorithm> | 5 #include <algorithm> |
6 | 6 |
7 #include "base/sys_info.h" | 7 #include "base/sys_info.h" |
8 #include "chrome/test/base/chrome_test_launcher.h" | 8 #include "chrome/test/base/chrome_test_launcher.h" |
9 #include "chrome/test/base/chrome_test_suite.h" | 9 #include "chrome/test/base/chrome_test_suite.h" |
10 | 10 |
| 11 #if defined(MOJO_SHELL_CLIENT) |
| 12 #include "chrome/test/base/mash_browser_tests_main.h" |
| 13 #endif |
| 14 |
11 int main(int argc, char** argv) { | 15 int main(int argc, char** argv) { |
| 16 #if defined(MOJO_SHELL_CLIENT) |
| 17 int exit_code = 0; |
| 18 if (RunMashBrowserTests(argc, argv, &exit_code)) |
| 19 return exit_code; |
| 20 #endif |
| 21 |
12 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); | 22 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); |
13 ChromeTestSuiteRunner runner; | 23 ChromeTestSuiteRunner runner; |
14 ChromeTestLauncherDelegate delegate(&runner); | 24 ChromeTestLauncherDelegate delegate(&runner); |
15 return LaunchChromeTests(default_jobs, &delegate, argc, argv); | 25 return LaunchChromeTests(default_jobs, &delegate, argc, argv); |
16 } | 26 } |
OLD | NEW |