summaryrefslogtreecommitdiffstats
path: root/content/test/content_test_launcher.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 17:23:03 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 17:23:03 +0000
commit7f41b585edcd979cfc61f5a01bb8fda0cdfe85ce (patch)
tree11bfced192e35358fea1dcb888929adf35dbe717 /content/test/content_test_launcher.cc
parent50bedcd6b687bb9e7edda46ab9054d846e2a7d07 (diff)
downloadchromium_src-7f41b585edcd979cfc61f5a01bb8fda0cdfe85ce.zip
chromium_src-7f41b585edcd979cfc61f5a01bb8fda0cdfe85ce.tar.gz
chromium_src-7f41b585edcd979cfc61f5a01bb8fda0cdfe85ce.tar.bz2
GTTF: make sharding_supervisor.py use --brave-new-test-launcher
BUG=236893 R=maruel@chromium.org Review URL: https://codereview.chromium.org/39213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_launcher.cc')
-rw-r--r--content/test/content_test_launcher.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 9a229a9..fae46c8 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -8,6 +8,7 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/path_service.h"
+#include "base/sys_info.h"
#include "base/test/test_suite.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/content_test_suite_base.h"
@@ -127,6 +128,7 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate {
} // namespace content
int main(int argc, char** argv) {
+ int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
content::ContentTestLauncherDelegate launcher_delegate;
- return LaunchTests(&launcher_delegate, argc, argv);
+ return LaunchTests(&launcher_delegate, default_jobs, argc, argv);
}