iOS gtest launcher: retry tests in one big batch

base/test/launcher/unit_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/unit_test_launcher.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 103 matching lines @@
                                    JoinString(test_names, ":"));
     new_cmd_line.AppendSwitch(kSingleProcessTestsFlag);
 
     return new_cmd_line;
   }
 
   std::string GetWrapperForChildGTestProcess() override {
     return std::string();
   }
 
+  void RelaunchTests(TestLauncher* test_launcher,
+                     const std::vector<std::string>& test_names,
+                     int launch_flags) override {
+    // Relaunch requested tests in parallel, but only use single
+    // test per batch for more precise results (crashes, etc).
+    for (const std::string& test_name : test_names) {
+      std::vector<std::string> batch;
+      batch.push_back(test_name);
+      RunUnitTestsBatch(test_launcher, this, batch, launch_flags);
+    }
+  }
+
   DISALLOW_COPY_AND_ASSIGN(DefaultUnitTestPlatformDelegate);
 };
 
 bool GetSwitchValueAsInt(const std::string& switch_name, int* result) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switch_name))
     return true;
 
   std::string switch_value =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switch_name);
   if (!StringToInt(switch_value, result) || *result < 1) {
@@ skipping 161 matching lines @@
     for (size_t i = 0; i < final_results.size(); i++) {
       if (final_results[i].status != TestResult::TEST_SUCCESS) {
         has_non_success_test = true;
         break;
       }
     }
 
     if (!has_non_success_test && exit_code != 0) {
       // This is a bit surprising case: all tests are marked as successful,
       // but the exit code was not zero. This can happen e.g. under memory
-      // tools that report leaks this way.
-
-      if (final_results.size() == 1) {
-        // Easy case. One test only so we know the non-zero exit code
-        // was caused by that one test.
-        final_results[0].status = TestResult::TEST_FAILURE_ON_EXIT;
-      } else {
-        // Harder case. Discard the results and request relaunching all
-        // tests without batching. This will trigger above branch on
-        // relaunch leading to more precise results.
-        LOG(WARNING) << "Not sure which test caused non-zero exit code, "
-                     << "relaunching all of them without batching.";
-
-        for (size_t i = 0; i < final_results.size(); i++)
-          tests_to_relaunch->push_back(final_results[i].full_name);
-
-        return false;
-      }
+      // tools that report leaks this way. Mark all tests as a failure on exit,
+      // and for more precise info they'd need to be retried serially.
+      for (size_t i = 0; i < final_results.size(); i++)
+        final_results[i].status = TestResult::TEST_FAILURE_ON_EXIT;
     }
 
     for (size_t i = 0; i < final_results.size(); i++) {
       // Fix the output snippet after possible changes to the test result.
       final_results[i].output_snippet =
           GetTestOutputSnippet(final_results[i], output);
       test_launcher->OnTestFinished(final_results[i]);
       called_any_callback = true;
     }
   } else {
@@ skipping 33 matching lines @@
     const GTestCallbackState& callback_state,
     int exit_code,
     const TimeDelta& elapsed_time,
     bool was_timeout,
     const std::string& output) {
   std::vector<std::string> tests_to_relaunch;
   ProcessTestResults(callback_state.test_launcher, callback_state.test_names,
                      callback_state.output_file, output, exit_code, was_timeout,
                      &tests_to_relaunch);
 
-  // Relaunch requested tests in parallel, but only use single
-  // test per batch for more precise results (crashes, test passes
-  // but non-zero exit codes etc).
-  for (size_t i = 0; i < tests_to_relaunch.size(); i++) {
-    std::vector<std::string> batch;
-    batch.push_back(tests_to_relaunch[i]);
-    RunUnitTestsBatch(callback_state.test_launcher,
-             callback_state.platform_delegate,
-             batch,
-             callback_state.launch_flags);
+  if (!tests_to_relaunch.empty()) {
+    callback_state.platform_delegate->RelaunchTests(
+        callback_state.test_launcher,
+        tests_to_relaunch,
+        callback_state.launch_flags);
   }
 
   // The temporary file's directory is also temporary.
   DeleteFile(callback_state.output_file.DirName(), true);
 }
 
 void SerialGTestCallback(
     const GTestCallbackState& callback_state,
     const std::vector<std::string>& test_names,
     int exit_code,
@@ skipping 191 matching lines @@
       FROM_HERE,
       Bind(&RunUnitTestsSerially,
            test_launcher,
            platform_delegate_,
            test_names,
            use_job_objects_ ? TestLauncher::USE_JOB_OBJECTS : 0));
   return test_names.size();
 }
 
 }  // namespace base