Add SunSpider and V8 Benchmark perf tests to Buildbot.

buildbot/scripts/master/factory_commands.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.
 
 """Set of utilities to add commands to a buildbot factory."""
 
 import os
 
 from buildbot.steps import shell
@@ skipping 102 matching lines @@
       'chromium-rel-jsc': 'xp-release-jsc/memory',
       'chromium-rel-xp-dual': 'xp-release-dual-core/memory',
       'chromium-rel-xp-single': 'xp-release-single-core/memory',
       'chromium-rel-vista-dual': 'vista-release-dual-core/memory',
       'chromium-rel-vista-single': 'vista-release-single-core/memory',
       'chromium-rel-xp-dual-v8': 'xp-release-v8-latest/memory',
       'chromium-rel-mac': 'mac-release/memory',
     }
   }
 
+  # Configuration of SunSpider tests.
+  SUNSPIDER_TEST_MAPPINGS = {
+    'Release': {
+      'chromium-rel-xp': 'xp-release/sunspider',
+      'chromium-rel-jsc': 'xp-release-jsc/sunspider',
+      'chromium-rel-xp-dual': 'xp-release-dual-core/sunspider',
+      'chromium-rel-xp-single': 'xp-release-single-core/sunspider',
+      'chromium-rel-vista-dual': 'vista-release-dual-core/sunspider',
+      'chromium-rel-vista-single': 'vista-release-single-core/sunspider',
+      'chromium-rel-xp-dual-v8': 'xp-release-v8-latest/sunspider',
+      'chromium-rel-mac': 'mac-release/sunspider',
+    }
+  }
+
+  # Configuration of V8 Benchmark tests.
+  V8_BENCHMARK_TEST_MAPPINGS = {
+    'Release': {
+      'chromium-rel-xp': 'xp-release/v8_benchmark',
+      'chromium-rel-jsc': 'xp-release-jsc/v8_benchmark',
+      'chromium-rel-xp-dual': 'xp-release-dual-core/v8_benchmark',
+      'chromium-rel-xp-single': 'xp-release-single-core/v8_benchmark',
+      'chromium-rel-vista-dual': 'vista-release-dual-core/v8_benchmark',
+      'chromium-rel-vista-single': 'vista-release-single-core/v8_benchmark',
+      'chromium-rel-xp-dual-v8': 'xp-release-v8-latest/v8_benchmark',
+      'chromium-rel-mac': 'mac-release/v8_benchmark',
+    }
+  }
+
 
   def __init__(self, factory=None, identifier=None, target=None,
                build_dir=None, target_platform=None):
     """Initializes the SlaveCommands class.
 
     Args:
       factory: Factory to configure
       identifier: full identifier for this build.  Typically the builder name
           (e.g., 'chrome-release').
       target: Build configuration, case-sensitive; probably 'Debug' or
@@ skipping 38 matching lines @@
     # Where to point waterfall links for builds and test results.
     self._archive_url = config.Master.archive_url
 
     # Purify isn't in the script_dir, it's out on its own.
     self._purify_tool = self.PathJoin('src', 'tools', 'purify',
                                       'chrome_tests.py')
 
     # Valgrind isn't in the script_dir, it's out on its own.
     self._valgrind_tool = self.PathJoin('src', 'tools', 'valgrind',
                                         'chrome_tests.sh')
-    
+
     # Gears test runner lives in the gears src tree.
     self._gears_test_runner = self.PathJoin('src', 'gears', 'gears',
                                             'test', 'runner', 'bootstrap.py')
-    
+
     # Gears working dir.
     self._gears_root = self.PathJoin('build', 'src', 'gears', 'gears')
 
     # These tools aren't in the script_dir either.
     # TODO(pamg): For consistency, move them into the script_dir if possible.
     self._check_deps_tool = self.PathJoin('src', 'tools', 'checkdeps',
                                           'checkdeps.py')
     self._debugger_test_tool = self.PathJoin('test', 'debugger',
                                              'debugger_unittests.py')
 
@@ skipping 32 matching lines @@
         chromium_utils.GetGClientCommand(self._target_platform),
         'sync', '--verbose']
 
   #######
   # Generic commands
 
   def GetTestCommand(self, executable, total_shards=None, shard_index=None,
                      arg_list=None):
     """Returns a command list to call the _test_tool on the given executable,
     passing the arg_list, if any, to that executable under test.
-    
+
     Automatically fix the executable name on Windows by adding '.exe'.
     """
     cmd = [self._python, self._test_tool,
            '--target', self._target,
            '--build-dir', self._build_dir]
 
     if total_shards and shard_index:
       cmd.extend(['--total-shards', str(total_shards),
                   '--shard-index', str(shard_index)])
 
@@ skipping 334 matching lines @@
                                    process_log.GraphingLogProcessor)
 
   def GetTabSwitchingTestCommand(self, perf_id, show_results,
                                  **kwargs):
     """Selects the right build step for the specified tab switching test.
     """
     return self.GetPerfTestCommand(perf_id, show_results,
                                    self.TAB_SWITCHING_TEST_MAPPINGS,
                                    process_log.GraphingLogProcessor)
 
+  def GetSunSpiderTestCommand(self, perf_id, show_results, **kwargs):
+    """Selects the right build step for the specified SunSpider test.
+    """
+    return self.GetPerfTestCommand(perf_id, show_results,
+                                   self.SUNSPIDER_TEST_MAPPINGS,
+                                   process_log.GraphingLogProcessor)
+
+  def GetV8BenchmarkTestCommand(self, perf_id, show_results, **kwargs):
+    """Selects the right build step for the specified V8 Benchmark test.
+    """
+    return self.GetPerfTestCommand(perf_id, show_results,
+                                   self.V8_BENCHMARK_TEST_MAPPINGS,
+                                   process_log.GraphingLogProcessor)
+
   def GetPageCyclerCommand(self, test_name, http):
     """Returns a command list to call the _test_tool on the page_cycler
     executable, with the appropriate GTest filter and additional arguments.
     """
     cmd = [self._python, self._test_tool,
            '--target', self._target,
            '--build-dir', self._build_dir]
     if http:
       test_type = 'Http'
       cmd.extend(['--with-httpd', self.PathJoin('src', 'data', 'page_cycler')])
     else:
       test_type = 'File'
     cmd.extend([self.GetExecutableName('page_cycler_tests'),
                 '--gtest_filter=PageCycler*.%s%s' % (test_name, test_type)])
     return cmd
-    
+
   def GetDomCheckerTestCommand(self):
     """Returns a command list to call the _test_tool for the DOM checker tests.
 
     The command list will have the appropriate GTest filter and arguments.
     """
     cmd = [self._python, self._test_tool,
            '--target', self._target,
            '--build-dir', self._build_dir]
 
     cmd.extend(['--with-httpd',
@@ skipping 116 matching lines @@
     """Adds a step to the factory to run the tab switching test."""
     c = self.GetTabSwitchingTestCommand(perf_id, show_results)
     options = ['--gtest_filter=TabSwitchingUITest.*', '-enable-logging',
                '-dump-histograms-on-exit']
     self.AddTestStep(command_class=c,
                      timeout=timeout,
                      test_name='tab_switching_test',
                      test_command=self.GetTestCommand('tab_switching_test',
                                                       arg_list=options))
 
+  def AddSunSpiderTests(self, show_results, perf_id=None, timeout=300):
+    """Adds a step to the factory to run the SunSpider test."""
+    c = self.GetSunSpiderTestCommand(perf_id, show_results)
+    options = ['--gtest_filter=SunSpider*.*', '--gtest_print_time',
+               '--run-sunspider']
+    self.AddTestStep(command_class=c,
+                     timeout=timeout,
+                     test_name='sunspider_test',
+                     test_command=self.GetTestCommand('sunspider_test',
+                                                      arg_list=options))
+
+  def AddV8BenchmarkTests(self, show_results, perf_id=None, timeout=300):
+    """Adds a step to the factory to run the SunSpider test."""
+    c = self.GetV8BenchmarkTestCommand(perf_id, show_results)
+    options = ['--gtest_filter=V8Benchmark*.*', '--gtest_print_time',
+               '--run-v8-benchmark']
+    self.AddTestStep(command_class=c,
+                     timeout=timeout,
+                     test_name='v8_benchmark_test',
+                     test_command=self.GetTestCommand('v8_benchmark_test',
+                                                      arg_list=options))
+
   #######
   # Chrome tests
 
   def GetReliabilityCommand(self):
     """Returns a command list to call the _reliability_tool."""
     return [self._depot_tools_python, self._reliability_tool,
             '--data-dir', self._reliability_data]
 
   def AddReliabilityTests(self, timeout=360):
     """Adds a step to the factory to query the reliability testing results.
@@ skipping 306 matching lines @@
       self.AddArchiveStep(
           data_description='webkit_tests results',
           timeout=archive_timeout,
           base_url=url,
           link_text='layout test results',
           command=self.GetWebkitArchiveCommand())
 
   def AddTestShellTests(self):
     """Adds a step to the factory to run the test_shell_tests."""
     self.AddBasicGTestTestStep('test_shell_tests')
-  
+
   def AddGearsMake(self, mode, clean=True):
     """Adds a step to the factory to build gears using make."""
     # Making gears from the open source repo requires a lot of setup,
     # so to simplify things this helper script is required to be
     # available on the builder.
     setup_env_and_make = r'c:\make_gears.bat'
     mode = mode or 'dbg'
     if clean:
       command_list = ['RD', '/S', '/Q', 'bin-%s' % mode]
       clean_timeout = 60
@@ skipping 51 matching lines @@
 
   def AddStageBuildStep(self):
     """Adds a step to stage the build"""
     self._factory.addStep(shell.ShellCommand,
                           description='stage_build',
                           timeout=1800,
                           command=[self._python, self._archive_tool,
                                    '--target', self._target,
                                    '--mode', 'official',
                                    '--build-dir', self._build_dir])