GTTF: add independent test timeout for the test launcher

base/test/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/unit_test_launcher.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 141 matching lines @@
     CommandLine cmd_line(
         GetCommandLineForChildGTestProcess(test_names, output_file));
 
     // Adjust the timeout depending on how many tests we're running
     // (note that e.g. the last batch of tests will be smaller).
     // TODO(phajdan.jr): Consider an adaptive timeout, which can change
     // depending on how many tests ran and how many remain.
     // Note: do NOT parse child's stdout to do that, it's known to be
     // unreliable (e.g. buffering issues can mix up the output).
     base::TimeDelta timeout =
-        test_names.size() * TestTimeouts::action_timeout();
+        test_names.size() * TestTimeouts::test_launcher_timeout();
 
     parallel_launcher_.LaunchChildGTestProcess(
         cmd_line,
         std::string(),
         timeout,
         Bind(&UnitTestLauncherDelegate::GTestCallback,
              base::Unretained(this),
              tests_,
              output_file));
     tests_.clear();
@@ skipping 54 matching lines @@
           TestResult test_result = results_map[tests[i].GetFullName()];
           if (test_result.status == TestResult::TEST_CRASH) {
             had_interrupted_test = true;
 
             if (was_timeout) {
               // Fix up the test status: we forcibly kill the child process
               // after the timeout, so from XML results it looks just like
               // a crash.
               test_result.status = TestResult::TEST_TIMEOUT;
             }
+          } else if (test_result.status == TestResult::TEST_SUCCESS ||
+                     test_result.status == TestResult::TEST_FAILURE) {
+            // We run multiple tests in a batch with a timeout applied
+            // to the entire batch. It is possible that with other tests
+            // running quickly some tests take longer than the per-test timeout.
+            // For consistent handling of tests independent of order and other
+            // factors, mark them as timing out.
+            if (test_result.elapsed_time >
+                TestTimeouts::test_launcher_timeout()) {
+              test_result.status = TestResult::TEST_TIMEOUT;
+            }
           }
           PrintTestOutputSnippetOnFailure(test_result, output);
           tests[i].callback.Run(test_result);
           called_any_callback = true;
         } else if (had_interrupted_test) {
           tests_to_relaunch_after_interruption->push_back(tests[i]);
         } else {
           // TODO(phajdan.jr): Explicitly pass the info that the test didn't
           // run for a mysterious reason.
           LOG(ERROR) << "no test result for " << tests[i].GetFullName();
@@ skipping 107 matching lines @@
 
   fprintf(stdout,
           "Tests took %" PRId64 " seconds.\n",
           (base::TimeTicks::Now() - start_time).InSeconds());
   fflush(stdout);
 
   return exit_code;
 }
 
 }  // namespace base