Only print summary of all test iterations if there is more than one.

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 324 matching lines @@
 
 TestLauncher::~TestLauncher() {
   if (worker_pool_owner_)
     worker_pool_owner_->pool()->Shutdown();
 }
 
 bool TestLauncher::Run(int argc, char** argv) {
   if (!Init())
     return false;
 
+  // Value of |cycles_| changes after each iteration. Keep track of the
+  // original value.
+  int requested_cycles = cycles_;
+
 #if defined(OS_POSIX)
   CHECK_EQ(0, pipe(g_shutdown_pipe));
 
   struct sigaction action;
   memset(&action, 0, sizeof(action));
   sigemptyset(&action.sa_mask);
   action.sa_handler = &ShutdownPipeSignalHandler;
 
   CHECK_EQ(0, sigaction(SIGINT, &action, NULL));
   CHECK_EQ(0, sigaction(SIGQUIT, &action, NULL));
@@ skipping 12 matching lines @@
 
   // Start the watchdog timer.
   watchdog_timer_.Reset();
 
   MessageLoop::current()->PostTask(
       FROM_HERE,
       Bind(&TestLauncher::RunTestIteration, Unretained(this)));
 
   MessageLoop::current()->Run();
 
-  if (cycles_ != 1)
+  if (requested_cycles != 1)
     results_tracker_.PrintSummaryOfAllIterations();
 
   MaybeSaveSummaryAsJSON();
 
   return run_result_;
 }
 
 void TestLauncher::LaunchChildGTestProcess(
     const CommandLine& command_line,
     const std::string& wrapper,
@@ skipping 465 matching lines @@
     int exit_code,
     const TimeDelta& elapsed_time,
     bool was_timeout,
     const std::string& output) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   callback.Run(exit_code, elapsed_time, was_timeout, output);
 }
 
 void TestLauncher::OnTestIterationFinished() {
-  // The current iteration is done.
-  fprintf(stdout, "%" PRIuS " test%s run\n",
-          test_finished_count_,
-          test_finished_count_ > 1 ? "s" : "");
-  fflush(stdout);
-
-  results_tracker_.PrintSummaryOfCurrentIteration();
-
   // When we retry tests, success is determined by having nothing more
   // to retry (everything eventually passed), as opposed to having
   // no failures at all.
-  if (!tests_to_retry_.empty()) {
+  if (tests_to_retry_.empty()) {
+    fprintf(stdout, "SUCCESS: all tests passed.\n");
+    fflush(stdout);
+  } else {
     // 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_.PrintSummaryOfCurrentIteration();
+
   // Kick off the next iteration.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       Bind(&TestLauncher::RunTestIteration, Unretained(this)));
 }
 
 void TestLauncher::OnOutputTimeout() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   AutoLock lock(g_live_processes_lock.Get());
@@ skipping 171 matching lines @@
 
     g_live_processes.Get().erase(process_handle);
   }
 
   base::CloseProcessHandle(process_handle);
 
   return exit_code;
 }
 
 }  // namespace base