Run skimage on the bots.

master/skia_master_scripts/factory.py

Index: master/skia_master_scripts/factory.py
diff --git a/master/skia_master_scripts/factory.py b/master/skia_master_scripts/factory.py
index 6b2853d3f7782bc30404e704764a7f0aeb7349bb..a71c8fdbca5fe5d8429e77708d3fa0a0ae933a2d 100644
--- a/master/skia_master_scripts/factory.py
+++ b/master/skia_master_scripts/factory.py
@@ -101,6 +101,13 @@ class SkiaFactory(BuildFactory):
         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',
+        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)
@@ -443,6 +450,12 @@ class SkiaFactory(BuildFactory):
     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',
@@ -452,6 +465,11 @@ class SkiaFactory(BuildFactory):
     """ 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',
@@ -619,6 +637,10 @@ class SkiaFactory(BuildFactory):
                         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()
@@ -629,15 +651,18 @@ class SkiaFactory(BuildFactory):
   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):