From ce2ca852eb8466d6208307aa75c1e4c75d9e9df9 Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Tue, 10 Dec 2013 05:46:53 +0000 Subject: linux_aura: Move parallel_jobs_ override to base/. The ui_unittests and views_unittests did not use the content layer, so they were still flaky. BUG=326701 Review URL: https://codereview.chromium.org/98713007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239680 0039d316-1c4b-4281-b951-d872f2087c98 --- base/test/launcher/test_launcher.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'base/test') diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc index 0b32c84..329ee2d 100644 --- a/base/test/launcher/test_launcher.cc +++ b/base/test/launcher/test_launcher.cc @@ -369,6 +369,17 @@ TestLauncher::TestLauncher(TestLauncherDelegate* launcher_delegate, // --test-launcher-jobs flag. parallel_jobs_ = 1; } + +#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) + // TODO(erg): Trying to parallelize tests on linux_aura makes things flaky + // because all shards share X11 state. http://crbug.com/326701 + parallel_jobs_ = 1; + + fprintf(stdout, + "Disabling parallelization due to the linux_aura flake. " + "http://crbug.com/326701\n"); + fflush(stdout); +#endif } TestLauncher::~TestLauncher() { -- cgit v1.1