Make sharding_supervisor.py run InProcessBrowserTest.Empty

content/test/test_launcher.cc

 // Copyright (c) 2012 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 "content/test/test_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 428 matching lines @@
   for (int i = 0; i < unit_test->total_test_case_count(); ++i) {
     const testing::TestCase* test_case = unit_test->GetTestCase(i);
     TestCasePrinterHelper helper(printer, test_case->name(),
                                  test_case->total_test_count());
     for (int j = 0; j < test_case->total_test_count(); ++j) {
       const testing::TestInfo* test_info = test_case->GetTestInfo(j);
       std::string test_name = test_info->test_case_name();
       test_name.append(".");
       test_name.append(test_info->name());
 
-      // Skip our special test so it's not run twice. That confuses
-      // the log parser.
-      if (test_name == kEmptyTestName)
+      // Skip our special test so it's not run twice, unless it's the only test
+      // being run, to avoid confusing the log parser.
+      if (test_name == kEmptyTestName && positive_filter != kEmptyTestName)
         continue;
 
       // Skip disabled tests.
       if (test_name.find("DISABLED") != std::string::npos &&
           !command_line->HasSwitch(kGTestRunDisabledTestsFlag)) {
         printer.OnTestEnd(test_info->name(), test_case->name(),
                           false, false, false, 0);
         continue;
       }
 
@@ skipping 168 matching lines @@
   TestTimeouts::Initialize();
   int exit_code = 0;
 
   // Make sure the entire browser code is loaded into memory. Reading it
   // from disk may be slow on a busy bot, and can easily exceed the default
   // timeout causing flaky test failures. Use an empty test that only starts
   // and closes a browser with a long timeout to avoid those problems.
   // NOTE: we don't do this when specifying a filter because this slows down the
   // common case of running one test locally, and also on trybots when sharding
   // as this one test runs ~200 times and wastes a few minutes.
   if (!should_shard && !command_line->HasSwitch(kGTestFilterFlag)) {

[Paweł Hajdan Jr., 2012/06/04 10:28:16]

I think the right place to fix it is here. Remove this "if", and it should be
much prettier.

[mmenke, 2012/06/04 14:38:11]

Done (Well...Mostly.  I kept the "!command_line->HasSwitch(kGTestFilterFlag)"
half of the conditional).

[mmenke, 2012/06/04 14:57:19]

Err...Wait...  How are tests sharded across multiple test on the waterfall?  By
using --gtest_filter, too?  If so, I'll either have to remove that check, too,
or use "(should_shard || !command_line->HasSwitch(kGTestFilterFlag)"

[mmenke, 2012/06/04 14:59:42]

Ah, |total_slaves|.  Saw that before, but forgot about it, so should be fine
as-is.

     exit_code = RunTest(launcher_delegate,
                         kEmptyTestName,
                         TestTimeouts::large_test_timeout_ms(),
                         NULL);
     if (exit_code != 0)
       return exit_code;
   }
 
   int cycles = 1;
   if (command_line->HasSwitch(kGTestRepeatFlag)) {
@@ skipping 11 matching lines @@
     }
 
     // Special value "-1" means "repeat indefinitely".
     if (cycles != -1)
       cycles--;
   }
   return exit_code;
 }
 
 }  // namespace test_launcher