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/public/test/test_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 556 matching lines @@
 const char kGTestOutputFlag[] = "gtest_output";
 
 const char kSingleProcessTestsFlag[]   = "single_process";
 const char kSingleProcessTestsAndChromeFlag[]   = "single-process";
 // The following is kept for historical reasons (so people that are used to
 // using it don't get surprised).
 const char kChildProcessFlag[]   = "child";
 
 const char kHelpFlag[]   = "help";
 
+const char kWarmupFlag[] = "warmup";
+
 TestLauncherDelegate::~TestLauncherDelegate() {
 }
 
 int LaunchTests(TestLauncherDelegate* launcher_delegate,
                 int argc,
                 char** argv) {
   launcher_delegate->EarlyInitialize();
 
   CommandLine::Init(argc, argv);
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ skipping 41 matching lines @@
       "process mode).\n");
 
   testing::InitGoogleTest(&argc, argv);
   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
+  // 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)) {
+  bool warmup = command_line->HasSwitch(kWarmupFlag);
+  bool has_filter = command_line->HasSwitch(kGTestFilterFlag);
+  if (warmup || (!should_shard && !has_filter)) {
     exit_code = RunTest(launcher_delegate,
                         kEmptyTestName,
                         TestTimeouts::large_test_timeout_ms(),
                         NULL);
-    if (exit_code != 0)
+    if (exit_code != 0 || warmup)
       return exit_code;
   }
 
   int cycles = 1;
   if (command_line->HasSwitch(kGTestRepeatFlag)) {
     base::StringToInt(command_line->GetSwitchValueASCII(kGTestRepeatFlag),
                       &cycles);
   }
 
   while (cycles != 0) {
     if (!RunTests(launcher_delegate,
                   should_shard,
                   total_shards,
                   shard_index)) {
       exit_code = 1;
       break;
     }
 
     // Special value "-1" means "repeat indefinitely".
     if (cycles != -1)
       cycles--;
   }
   return exit_code;
 }
 
 }  // namespace test_launcher