Update smoketests.py so we can run ui_tests in parallel, with...

chrome/tools/test/smoketests.py

 #!/usr/bin/python
 # Copyright (c) 2006-2008 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.
 
 """
 Runs all the available unit tests, layout tests, page-cycler tests, etc.
 for a build of Chrome, imitating a buildbot.
 
 Usage examples:
@@ skipping 91 matching lines @@
                    'build_type':    options.build_type,
                    'page_heap':     '',
                    'python':        python_path,
                    'slave_scripts': _BuildbotScriptPath('slave'),
                   }
   if options.build_type == 'kjs':
     substitutions['page_heap'] = '--enable-pageheap'
   return [word % substitutions for word in list]
 
 
+def RunTestsInShards(test_command, verbose=True):
+  """Runs a test in shards. The number of shards is equal to
+  NUMBER_OF_PROCESSORS.
+
+  Args:
+    test_command: the test command to run, which is a list of one or more
+                  strings.
+    verbose: if True, combines stdout and stderr into stdout.
+             Otherwise, prints only the command's stderr to stdout.
+
+  Returns:
+    The first shard process's exit status.
+
+  Raises:
+    CommandNotFound if the command executable could not be found.
+  """
+  processor_count = 2

[M-A Ruel, 2009/07/29 22:24:46]

nit: I think it should default to 1.

+  try:
+    processor_count = int(os.environ['NUMBER_OF_PROCESSORS'])
+  except KeyError:
+    print 'No NUMBER_OF_PROCESSORS defined. Use 2 instances.'
+
+  commands = []
+  for i in xrange(processor_count):
+    command = [test_command[j] for j in xrange(len(test_command))]
+    # To support sharding, the test executable needs to provide --batch-count
+    # --batch-index command line switches.
+    command.append('--batch-count=%s' % processor_count)
+    command.append('--batch-index=%d' % i)
+    commands.append(command)
+  return google.process_utils.RunCommandsInParallel(commands, verbose)[0][0]
+
+
 def main(options, args):
   """Runs all the selected tests for the given build type and target."""
   options.build_type = options.build_type.lower()
   options.target = options.target.title()
 
   this_script_dir = google.path_utils.ScriptDir()
   test_path = google.path_utils.FindUpward(this_script_dir,
                                            'chrome', options.target)
 
   # Add the buildbot script paths to the module search path.
@@ skipping 55 matching lines @@
   failures = []
   start_time = time.time()
   for test in tests:
     test_start_time = time.time()
     command = _MakeSubstitutions(COMMANDS[test], options)
     command[0] = os.path.join(test_path, command[0])
     if options.verbose:
       print
     print 'Running %s:' % test,
     try:
-      result = google.process_utils.RunCommand(command, options.verbose)
+      if test == 'ui':
+        result = RunTestsInShards(command, options.verbose)
+      else:
+        result = google.process_utils.RunCommand(command, options.verbose)
     except google.process_utils.CommandNotFound, e:
       print '%s' % e
       raise
     if options.verbose:
       print test,
     print '(%ds)' % (time.time() - test_start_time),
     if result:
       print 'FAIL'
       failures.append(test)
     else:
@@ skipping 36 matching lines @@
     kill_list = set([os.path.basename(x) for x in kill_list])
     sys.exit(google.process_utils.KillAll(kill_list))
 
   try:
     result = main(options, args)
   finally:
     # Kill the httpd.
     if _httpd:
       _httpd.StopServer(force=True)
   sys.exit(result)