Calculate broken tests threshold based on number of tests in binary, before applying filter

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 434 matching lines @@
 
 TestLauncherDelegate::~TestLauncherDelegate() {
 }
 
 TestLauncher::TestLauncher(TestLauncherDelegate* launcher_delegate,
                            size_t parallel_jobs)
     : launcher_delegate_(launcher_delegate),
       total_shards_(1),
       shard_index_(0),
       cycles_(1),
+      test_found_count_(0),
       test_started_count_(0),
       test_finished_count_(0),
       test_success_count_(0),
       test_broken_count_(0),
       retry_count_(0),
       retry_limit_(0),
       force_run_broken_tests_(false),
       run_result_(true),
       watchdog_timer_(FROM_HERE,
                       TimeDelta::FromSeconds(kOutputTimeoutSeconds),
@@ skipping 149 matching lines @@
   watchdog_timer_.Reset();
 
   // Do not waste time on timeouts. We include tests with unknown results here
   // because sometimes (e.g. hang in between unit tests) that's how a timeout
   // gets reported.
   if (result.status == TestResult::TEST_TIMEOUT ||
       result.status == TestResult::TEST_UNKNOWN) {
     test_broken_count_++;
   }
   size_t broken_threshold =
-      std::max(static_cast<size_t>(20), test_started_count_ / 10);
+      std::max(static_cast<size_t>(20), test_found_count_ / 10);
   if (!force_run_broken_tests_ && test_broken_count_ >= broken_threshold) {
     fprintf(stdout, "Too many badly broken tests (%" PRIuS "), exiting now.\n",
             test_broken_count_);
     fflush(stdout);
 
 #if defined(OS_POSIX)
     KillSpawnedTestProcesses();
 #endif  // defined(OS_POSIX)
 
     results_tracker_.AddGlobalTag("BROKEN_TEST_EARLY_EXIT");
@@ skipping 285 matching lines @@
       // Skip disabled tests unless explicitly requested.
       if (!command_line->HasSwitch(kGTestRunDisabledTestsFlag))
         continue;
     }
 
     if (!launcher_delegate_->ShouldRunTest(
         tests_[i].test_case_name, tests_[i].test_name)) {
       continue;
     }
 
+    // Count tests in the binary, before we apply filter and sharding.
+    test_found_count_++;
+
     // Skip the test that doesn't match the filter (if given).
     if (!positive_test_filter_.empty()) {
       bool found = false;
       for (size_t k = 0; k < positive_test_filter_.size(); ++k) {
         if (MatchPattern(test_name, positive_test_filter_[k])) {
           found = true;
           break;
         }
       }
 
@@ skipping 33 matching lines @@
       CommandLine::ForCurrentProcess()->HasSwitch(kGTestBreakOnFailure);
   if (cycles_ == 0 ||
       (stop_on_failure && test_success_count_ != test_finished_count_)) {
     MessageLoop::current()->QuitWhenIdle();
     return;
   }
 
   // Special value "-1" means "repeat indefinitely".
   cycles_ = (cycles_ == -1) ? cycles_ : cycles_ - 1;
 
+  test_found_count_ = 0;
   test_started_count_ = 0;
   test_finished_count_ = 0;
   test_success_count_ = 0;
   test_broken_count_ = 0;
   retry_count_ = 0;
   tests_to_retry_.clear();
   results_tracker_.OnTestIterationStarting();
 
   ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, Bind(&TestLauncher::RunTests, Unretained(this)));
@@ skipping 95 matching lines @@
   }
 
   std::string snippet(full_output.substr(run_pos));
   if (end_pos != std::string::npos)
     snippet = full_output.substr(run_pos, end_pos - run_pos);
 
   return snippet;
 }
 
 }  // namespace base