Revert "Remove performance_ui_tests from bot configs."

scripts/master/factory/chromium_commands.py

 # 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.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds chromium-specific commands."""
 
 import logging
 import os
@@ skipping 266 matching lines @@
                           maxTime=10*60*60,
                           description='packaging source',
                           descriptionDone='packaged source',
                           base_url=None,
                           link_text=None,
                           more_link_url=None,
                           more_link_text=None,
                           command=cmd)
 
   def GetAnnotatedPerfCmd(self, gtest_filter, log_type, test_name,
-                          cmd_name, tool_opts=None,
+                          cmd_name='performance_ui_tests', tool_opts=None,
                           options=None, factory_properties=None,
                           py_script=False, dashboard_url=None):
     """Return a runtest command suitable for most perf test steps."""
 
     dashboard_url = dashboard_url or config.Master.dashboard_upload_url
 
     tool_options = ['--annotate=' + log_type]
     tool_options.extend(tool_opts or [])
     tool_options.append('--results-url=%s' % dashboard_url)
 
@@ skipping 20 matching lines @@
           # Prevents breakages in perf tests, but we shouldn't have to set this.
           # TODO(phajdan.jr): Do not set this.
           '--single-process-tests',
           ])
 
       return self.GetTestCommand(cmd_name, wrapper_args=tool_options,
                                  arg_list=arg_list,
                                  factory_properties=factory_properties)
 
   def AddAnnotatedPerfStep(self, test_name, gtest_filter, log_type,
-                           factory_properties, cmd_name,
+                           factory_properties, cmd_name='performance_ui_tests',
                            tool_opts=None, cmd_options=None, step_name=None,
                            timeout=1200, py_script=False, dashboard_url=None,
                            addmethod=None, alwaysRun=False):
 
     """Add an annotated perf step to the builder.
 
     Args:
       test_name: name of the test given to runtest.py. If step_name is not
         provided, a standard transform will be applied and the step on the
         waterfall will be test_name_test.
 
       gtest_filter: most steps use --gtest_filter to filter their output.
 
       log_type: one of the log parsers in runtest.py --annotate=list, such
         as 'graphing' or 'framerate'.
 
-      cmd_name: command to run.
+      cmd_name: command to run, by default 'performance_ui_tests'.
 
       tool_opts: additional options for runtest.py.
 
       cmd_options: additional options for the test run under runtest.py.
 
       step_name: the step name for the builder/waterfall.
 
       factory_properties: additional properties from the factory.
     """
 
@@ skipping 104 matching lines @@
                               cmd_name='media_perftests',
                               step_name='media_perftests',
                               factory_properties=factory_properties)
 
   def AddLoadLibraryPerfTests(self, factory_properties=None):
     self.AddAnnotatedPerfStep('load_library_perf_tests', None, 'graphing',
                               cmd_name='load_library_perf_tests',
                               step_name='load_library_perf_tests',
                               factory_properties=factory_properties)
 
+  def AddMemoryTests(self, factory_properties=None):
+    self.AddAnnotatedPerfStep('memory', 'GeneralMix*MemoryTest.*', 'graphing',
+                              factory_properties=factory_properties)
+
+  def AddSyncPerfTests(self, factory_properties=None):
+    options = ['--ui-test-action-max-timeout=120000']
+
+    self.AddAnnotatedPerfStep('sync', '*SyncPerfTest.*', 'graphing',
+                              cmd_options=options, step_name='sync',
+                              factory_properties=factory_properties)
+
   def AddSizesTests(self, factory_properties=None):
     factory_properties = factory_properties or {}
 
     # For Android, platform is hardcoded as target_platform is set to linux2.
     # By default, the sizes.py script looks at sys.platform to identify
     # the platform (which is also linux2).
     args = ['--target', self._target]
 
     if self._target_os == 'android':
       args.extend(['--platform', 'android'])
@@ skipping 231 matching lines @@
     options.append(factory_properties.get('browser_tests_filter', []))
     options.extend(factory_properties.get('browser_tests_extra_options', []))
 
     options = filter(None, options)
 
     self.AddBuildrunnerGTest('browser_tests', factory_properties,
                              description, options,
                              total_shards=total_shards,
                              shard_index=shard_index)
 
+  def AddDomCheckerTests(self):
+    cmd = [self._python, self._test_tool,
+           '--target', self._target]
+
+    cmd.extend(['--with-httpd',
+                self.PathJoin('src', 'chrome', 'test', 'data')])
+
+    cmd.extend([self.GetExecutableName('performance_ui_tests'),
+                '--gtest_filter=DomCheckerTest.*',
+                '--gtest_print_time',
+                '--run-dom-checker-test'])
+
+    self.AddTestStep(shell.ShellCommand, 'dom_checker_tests', cmd,
+                     do_step_if=self.TestStepFilter)
+
+  def AddBuildrunnerDomCheckerTests(self):
+    cmd = [self._python, self._test_tool,
+           '--target', self._target]
+
+    cmd.extend(['--with-httpd',
+                self.PathJoin('src', 'chrome', 'test', 'data')])
+
+    cmd.extend([self.GetExecutableName('performance_ui_tests'),
+                '--gtest_filter=DomCheckerTest.*',
+                '--gtest_print_time',
+                '--run-dom-checker-test'])
+
+    self.AddBuildrunnerTestStep(shell.ShellCommand, 'dom_checker_tests', cmd,
+                                do_step_if=self.TestStepFilter)
+
   def AddMemoryTest(self, test_name, tool_name, timeout=1200,
                     factory_properties=None,
                     wrapper_args=None, addmethod=None):
     factory_properties = factory_properties or {}
     factory_properties['full_test_name'] = True
     if not wrapper_args:
       wrapper_args = []
     wrapper_args.extend([
         '--annotate=gtest',
         '--test-type', 'memory test: %s' % test_name,
@@ skipping 797 matching lines @@
   return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name)
 
 
 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'):
   if not factory_properties or 'gs_bucket' not in factory_properties:
     return (_GetArchiveUrl('snapshots', builder_name), None)
   gs_bucket = factory_properties['gs_bucket']
   gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/',
                      gs_bucket)
   return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/')