GTTF: only print the message about skipping retries when it actually applies.

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 486 matching lines @@
 #if defined(OS_POSIX)
     KillSpawnedTestProcesses();
 #endif  // defined(OS_POSIX)
 
     results_tracker_.AddGlobalTag("BROKEN_TEST_EARLY_EXIT");
     MaybeSaveSummaryAsJSON();
 
     exit(1);
   }
 
-  if (test_finished_count_ == test_started_count_) {
-    if (!tests_to_retry_.empty()) {
-      if (retry_count_ < retry_limit_ &&
-          tests_to_retry_.size() < broken_threshold) {
-        retry_count_++;
+  if (test_finished_count_ != test_started_count_)
+    return;
 
-        std::vector<std::string> test_names(tests_to_retry_.begin(),
-                                            tests_to_retry_.end());
+  if (tests_to_retry_.empty() ||

[sky, 2014/01/06 19:27:39]

nit: fit on one line.

[Paweł Hajdan Jr., 2014/01/07 09:19:35]

Done.

+      retry_count_ >= retry_limit_) {
+    OnTestIterationFinished();
+    return;
+  }
 
-        tests_to_retry_.clear();
+  if (tests_to_retry_.size() >= broken_threshold) {
+    fprintf(stdout,
+            "Too many failing tests (%" PRIuS "), skipping retries.\n",
+            tests_to_retry_.size());
+    fflush(stdout);
 
-        size_t retry_started_count =
-            launcher_delegate_->RetryTests(this, test_names);
-        if (retry_started_count == 0) {
-          // Signal failure, but continue to run all requested test iterations.
-          // With the summary of all iterations at the end this is a good
-          // default.
-          run_result_ = false;
+    results_tracker_.AddGlobalTag("BROKEN_TEST_SKIPPED_RETRIES");
 
-          OnTestIterationFinished();
-        } else {
-          fprintf(stdout, "Retrying %" PRIuS " test%s (retry #%" PRIuS ")\n",
-                  retry_started_count,
-                  retry_started_count > 1 ? "s" : "",
-                  retry_count_);
-          fflush(stdout);
+    OnTestIterationFinished();
+    return;
+  }
 
-          test_started_count_ += retry_started_count;
-        }
-      } else {
-        fprintf(stdout,
-                "Too many failing tests (%" PRIuS "), skipping retries.\n",
-                tests_to_retry_.size());
-        fflush(stdout);
+  retry_count_++;
 
-        results_tracker_.AddGlobalTag("BROKEN_TEST_SKIPPED_RETRIES");
+  std::vector<std::string> test_names(tests_to_retry_.begin(),
+                                      tests_to_retry_.end());
 
-        OnTestIterationFinished();
-      }
-    } else {
-      OnTestIterationFinished();
-    }
+  tests_to_retry_.clear();
+
+  size_t retry_started_count = launcher_delegate_->RetryTests(this, test_names);
+  if (retry_started_count == 0) {
+    // Signal failure, but continue to run all requested test iterations.
+    // With the summary of all iterations at the end this is a good default.
+    run_result_ = false;
+
+    OnTestIterationFinished();
+    return;
   }
+
+  fprintf(stdout, "Retrying %" PRIuS " test%s (retry #%" PRIuS ")\n",
+          retry_started_count,
+          retry_started_count > 1 ? "s" : "",
+          retry_count_);
+  fflush(stdout);
+
+  test_started_count_ += retry_started_count;
 }
 
 bool TestLauncher::Init() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // Initialize sharding. Command line takes precedence over legacy environment
   // variables.
   if (command_line->HasSwitch(switches::kTestLauncherTotalShards) &&
       command_line->HasSwitch(switches::kTestLauncherShardIndex)) {
     if (!StringToInt(
@@ skipping 444 matching lines @@
 
     g_live_processes.Get().erase(process_handle);
   }
 
   base::CloseProcessHandle(process_handle);
 
   return exit_code;
 }
 
 }  // namespace base