Change gtest launcher to run in parallel and retry failures by default.

base/test/launcher/test_launcher.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/launcher/test_launcher.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #endif
 
@@ skipping 318 matching lines @@
       test_success_count_(0),
       test_broken_count_(0),
       retry_count_(0),
       retry_limit_(0),
       run_result_(true),
       watchdog_timer_(FROM_HERE,
                       TimeDelta::FromSeconds(kOutputTimeoutSeconds),
                       this,
                       &TestLauncher::OnOutputTimeout),
       parallel_jobs_(parallel_jobs) {
-  if (BotModeEnabled()) {
-    fprintf(stdout,
-            "Enabling defaults optimized for continuous integration bots.\n");
-    fflush(stdout);
-
-    // Enable test retries by default for bots. This can be still overridden
-    // from command line using --test-launcher-retry-limit flag.
-    retry_limit_ = 3;
-  } else {
-    // Default to serial test execution if not running on a bot. This makes it
-    // possible to disable stdio redirection and can still be overridden with
-    // --test-launcher-jobs flag.
-    parallel_jobs_ = 1;
-  }
 }
 
 TestLauncher::~TestLauncher() {
   if (worker_pool_owner_)
     worker_pool_owner_->pool()->Shutdown();
 }
 
 bool TestLauncher::Run() {
   if (!Init())
     return false;
@@ skipping 280 matching lines @@
           switches::kTestLauncherRetryLimit)) {
     int retry_limit = -1;
     if (!StringToInt(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                          switches::kTestLauncherRetryLimit), &retry_limit) ||
         retry_limit < 0) {
       LOG(ERROR) << "Invalid value for " << switches::kTestLauncherRetryLimit;
       return false;
     }
 
     retry_limit_ = retry_limit;
+  } else if (!CommandLine::ForCurrentProcess()->HasSwitch(kGTestFilterFlag)) {
+    // Retry failures 3 times by default if we are running all of the tests.
+    retry_limit_ = 3;
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kTestLauncherJobs)) {
     int jobs = -1;
     if (!StringToInt(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                          switches::kTestLauncherJobs), &jobs) ||
         jobs < 0) {
       LOG(ERROR) << "Invalid value for " << switches::kTestLauncherJobs;
       return false;
     }
 
     parallel_jobs_ = jobs;
+  } else if (CommandLine::ForCurrentProcess()->HasSwitch(kGTestFilterFlag)) {
+    // Do not run jobs in parallel by default if we are running a subset of
+    // the tests.
+    parallel_jobs_ = 1;
   }
+
   fprintf(stdout, "Using %" PRIuS " parallel jobs.\n", parallel_jobs_);
   fflush(stdout);
   worker_pool_owner_.reset(
       new SequencedWorkerPoolOwner(parallel_jobs_, "test_launcher"));
 
   if (command_line->HasSwitch(switches::kTestLauncherFilterFile) &&
       command_line->HasSwitch(kGTestFilterFlag)) {
     LOG(ERROR) << "Only one of --test-launcher-filter-file and --gtest_filter "
                << "at a time is allowed.";
     return false;
@@ skipping 420 matching lines @@
 
     g_live_processes.Get().erase(process_handle);
   }
 
   base::CloseProcessHandle(process_handle);
 
   return exit_code;
 }
 
 }  // namespace base