diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 17:23:03 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 17:23:03 +0000 |
| commit | 7f41b585edcd979cfc61f5a01bb8fda0cdfe85ce (patch) | |
| tree | 11bfced192e35358fea1dcb888929adf35dbe717 /content | |
| parent | 50bedcd6b687bb9e7edda46ab9054d846e2a7d07 (diff) | |
| download | chromium_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')
| -rw-r--r-- | content/content_browsertests.isolate | 2 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 6 | ||||
| -rw-r--r-- | content/public/test/test_launcher.cc | 26 | ||||
| -rw-r--r-- | content/public/test/test_launcher.h | 4 | ||||
| -rw-r--r-- | content/test/content_test_launcher.cc | 4 |
5 files changed, 22 insertions, 20 deletions
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 7312750..975c39e 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -26,7 +26,6 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -76,7 +75,6 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index 780aefb..92a448b 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -35,8 +35,8 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', @@ -49,8 +49,8 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', ], 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.so', @@ -61,8 +61,8 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', ], 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/aura_test_support_resources.pak', diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 31dbef2..c48aee4 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc @@ -367,10 +367,7 @@ void WrapperTestLauncherDelegate::GTestCallback( result.elapsed_time = elapsed_time; - // TODO(phajdan.jr): Use base::PrintTestOutputSnippetOnFailure after migrating - // away from run_test_cases.py (http://crbug.com/236893). - fprintf(stdout, "%s", output.c_str()); - fflush(stdout); + result.output_snippet = GetTestOutputSnippet(result, output); if (ContainsKey(dependent_test_map_, test_name)) RunDependentTest(test_launcher, dependent_test_map_[test_name], result); @@ -439,6 +436,7 @@ int RunContentMain(int argc, char** argv, } int LaunchTests(TestLauncherDelegate* launcher_delegate, + int default_jobs, int argc, char** argv) { DCHECK(!g_launcher_delegate); @@ -470,23 +468,23 @@ int LaunchTests(TestLauncherDelegate* launcher_delegate, if (ShouldRunContentMain()) return RunContentMain(argc, argv, launcher_delegate); - fprintf(stdout, - "Starting tests...\n" - "IMPORTANT DEBUGGING NOTE: each test is run inside its own process.\n" - "For debugging a test inside a debugger, use the\n" - "--gtest_filter=<your_test_name> flag along with either\n" - "--single_process (to run the test in one launcher/browser process) or\n" - "--single-process (to do the above, and also run Chrome in single-" - "process mode).\n"); - base::AtExitManager at_exit; testing::InitGoogleTest(&argc, argv); TestTimeouts::Initialize(); - int jobs = 1; // TODO(phajdan.jr): Default to half the number of CPU cores. + int jobs = default_jobs; if (!GetSwitchValueAsInt(switches::kTestLauncherJobs, &jobs)) return 1; + fprintf(stdout, + "Starting tests (using %d parallel jobs)...\n" + "IMPORTANT DEBUGGING NOTE: each test is run inside its own process.\n" + "For debugging a test inside a debugger, use the\n" + "--gtest_filter=<your_test_name> flag along with either\n" + "--single_process (to run the test in one launcher/browser process) or\n" + "--single-process (to do the above, and also run Chrome in single-" + "process mode).\n", jobs); + base::MessageLoopForIO message_loop; WrapperTestLauncherDelegate delegate(launcher_delegate, jobs); diff --git a/content/public/test/test_launcher.h b/content/public/test/test_launcher.h index df3f56c..268eab5 100644 --- a/content/public/test/test_launcher.h +++ b/content/public/test/test_launcher.h @@ -43,7 +43,11 @@ class TestLauncherDelegate { virtual ~TestLauncherDelegate(); }; +// Launches tests using |launcher_delegate|. |default_jobs| is number +// of test jobs to be run in parallel, unless overridden from the command line. +// Returns exit code. int LaunchTests(TestLauncherDelegate* launcher_delegate, + int default_jobs, int argc, char** argv) WARN_UNUSED_RESULT; 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); } |