Run skimage on the bots.

master/skia_master_scripts/factory.py

 # Copyright (c) 2013 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.
 
 
 """Utility class to build the Skia master BuildFactory's.
 
 Based on gclient_factory.py and adds Skia-specific steps."""
 
 
@@ skipping 83 matching lines @@
       self.TargetPathJoin = ntpath.join
     else:
       self.TargetPathJoin = posixpath.join
 
     # Create gclient solutions corresponding to the main build_subdir
     # and other directories we also wish to check out.
     self._gclient_solutions = [gclient_factory.GClientSolution(
         svn_url=SKIA_SVN_BASEURL + '/' + build_subdir, name=build_subdir
         ).GetSpec()]
 
+    # Add the directory for expectations files.
+    expectations_gclient = gclient_factory.GClientSolution(
+        svn_url='https://skia.googlesource.com/expectations.git',

[borenet, 2013/06/25 18:19:12]

As discussed before, I think the expectations belong in the Skia repository.

[scroggo, 2013/06/25 19:28:56]

Sorry, I added the expectations repository before we got into the depths of
discussing where everything should go. Is the structure in
https://docs.google.com/a/google.com/document/d/1FSKX0u6Q7W_pQby000fV93y7Gndf...
final? Should I check this directory into our SVN repo alongside gm-expected for
now?

[borenet, 2013/06/25 19:55:40]

I think we came to the agreement that the expectations needed to go in the
primary repository.  I got the impression that the other aspects of the new
structure were agreeable, but I don't think we're in a hurry to implement them.

For now, placing them alongside gm-expected should be okay, but they'll need to
be moved before we can switch to git.  Alternatively, we could go ahead and
create an expectations directory inside of trunk.

+        name='expectations', managed=True).GetSpec()
+    print 'expectations: \n' + expectations_gclient
+    self._gclient_solutions.append(expectations_gclient)
+
     if not other_subdirs:
       other_subdirs = []
     subdirs_to_checkout = set(other_subdirs)
 
     # Trybots need to check out all of these directories.
     if do_patch_step:
       subdirs_to_checkout.add('gm-expected')
     for other_subdir in subdirs_to_checkout:
       self._gclient_solutions.append(gclient_factory.GClientSolution(
           svn_url=SKIA_SVN_BASEURL + '/' + other_subdir,
@@ skipping 322 matching lines @@
   def Install(self):
     """ Install the compiled executables. """
     self.AddFlavoredSlaveScript(script='install.py', description='Install',
                                 halt_on_failure=True)
 
   def DownloadSKPs(self):
     """ Download the SKPs. """
     self.AddSlaveScript(script='download_skps.py', description='DownloadSKPs',
                         halt_on_failure=True)
 
+  def DownloadSKImageFiles(self):
+    """ Download image files for running skimage. """
+    self.AddSlaveScript(script='download_skimage_files.py',
+                        description='DownloadSKImageFiles',
+                        halt_on_failure=True)
+
   def DownloadBaselines(self):
     """ Download the GM baselines. """
     self.AddSlaveScript(script='download_baselines.py',
                         description='DownloadBaselines', halt_on_failure=True)
 
   def RunTests(self):
     """ Run the unit tests. """
     self.AddFlavoredSlaveScript(script='run_tests.py', description='RunTests')
 
+  def RunDecodingTests(self):
+    """ Run tests of image decoders. """
+    self.AddFlavoredSlaveScript(script='run_decoding_tests.py',
+                                description='RunDecodingTests')
+
   def RunGM(self):
     """ Run the "GM" tool, saving the images to disk. """
     self.AddFlavoredSlaveScript(script='run_gm.py', description='GenerateGMs',
                                 is_rebaseline_step=True)
 
   def PreRender(self):
     """ Step to run before the render steps. """
     self.AddFlavoredSlaveScript(script='prerender.py', description='PreRender')
 
   def RenderPictures(self):
@@ skipping 147 matching lines @@
 
 
   def UploadGMResults(self):
     """ Upload the images generated by GM """
     args = ['--autogen_svn_username_file', self._autogen_svn_username_file,
             '--autogen_svn_password_file', self._autogen_svn_password_file]
     self.AddSlaveScript(script='upload_gm_results.py', args=args,
                         description='UploadGMResults', timeout=5400,
                         is_rebaseline_step=True)
 
+  def UploadSKImageResults(self):
+    self.AddSlaveScript(script='upload_skimage_results.py',
+                        description="UploadSKImageResults")
+
   def CommonSteps(self, clobber=None):
     """ Steps which are run at the beginning of all builds. """
     self.UpdateSteps()
     self.DownloadSKPs()
     self.Compile(clobber)
     self.Install()
 
   def NonPerfSteps(self):
     """ Add correctness testing BuildSteps. """
     self.DownloadBaselines()
+    self.DownloadSKImageFiles()
     self.PreRender()
     self.RunTests()
     self.RunGM()
     self.RenderPictures()
     self.RenderPdfs()
+    self.RunDecodingTests()
     self.PostRender()
     if self._do_upload_results:
       self.UploadGMResults()
       self.CompareAndUploadWebpageGMs()
+      self.UploadSKImageResults()
     self.CompareGMs()
 
   def PerfSteps(self):
     """ Add performance testing BuildSteps. """
     self.PreBench()
     self.RunBench()
     self.BenchPictures()
     self.PostBench()
     self.CheckForRegressions()
     self.BenchGraphs()
@@ skipping 38 matching lines @@
         # Perf-only builder.
         if not self._perf_output_basedir:
           raise ValueError(
               'BuildPerfOnly requires perf_output_basedir to be defined.')
         if self._configuration != CONFIG_RELEASE:
           raise ValueError('BuildPerfOnly should run in %s configuration.' %
                            CONFIG_RELEASE)
         self.PerfSteps()
     self.Validate()
     return self