Run skimage on the bots.

slave/skia_slave_scripts/build_step.py

Index: slave/skia_slave_scripts/build_step.py
diff --git a/slave/skia_slave_scripts/build_step.py b/slave/skia_slave_scripts/build_step.py
index f65de908d103de102aaaa3b00d98159a919f6630..f2a8aa8edc163bddba88c14226b72268ce86a217 100644
--- a/slave/skia_slave_scripts/build_step.py
+++ b/slave/skia_slave_scripts/build_step.py
@@ -15,6 +15,7 @@ import sys
 import time
 import traceback
 
+from get_subdir import GetSubDirFromBuilderName
 from playback_dirs import LocalSkpPlaybackDirs
 from playback_dirs import StorageSkpPlaybackDirs
 from utils import file_utils
@@ -84,11 +85,15 @@ class BuildStepLogger(object):
 
 class DeviceDirs(object):
   def __init__(self, perf_data_dir, gm_actual_dir, gm_expected_dir,
-               resource_dir, skp_dir, skp_perf_dir, skp_out_dir, tmp_dir):
+               resource_dir, skimage_in_dir, skimage_expected_dir,
+               skimage_out_dir, skp_dir, skp_perf_dir, skp_out_dir, tmp_dir):
     self._perf_data_dir = perf_data_dir
     self._gm_actual_dir = gm_actual_dir
     self._gm_expected_dir = gm_expected_dir
     self._resource_dir = resource_dir
+    self._skimage_in_dir = skimage_in_dir
+    self._skimage_expected_dir = skimage_expected_dir
+    self._skimage_out_dir = skimage_out_dir
     self._skp_dir = skp_dir
     self._skp_perf_dir = skp_perf_dir
     self._skp_out_dir = skp_out_dir
@@ -106,6 +111,15 @@ class DeviceDirs(object):
   def ResourceDir(self):
     return self._resource_dir
 
+  def SKImageInDir(self):
+    return self._skimage_in_dir
+
+  def SKImageExpectedDir(self):
+    return self._skimage_expected_dir
+
+  def SKImageOutDir(self):
+    return self._skimage_out_dir
+
   def SKPDir(self):
     return self._skp_dir
 
@@ -232,6 +246,17 @@ class BuildStep(multiprocessing.Process):
       self._perf_data_dir = None
       self._perf_graphs_dir = None
 
+    skimage_subdir = GetSubDirFromBuilderName(self._builder_name)

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

Would it be equivalent to use self._gm_image_subdir?

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

Yes. Thanks!

+    if None == skimage_subdir:
+      raise BuildStepFailure("Could not find subdir for " + self._builder_name)
+
+    self._skimage_in_dir = os.path.join(os.pardir, 'skimage_in')
+
+    self._skimage_expected_dir = os.path.join(os.pardir, 'expectations',
+                                              'skimage', skimage_subdir)
+    self._skimage_out_dir = os.path.join('out', self._configuration,
+                                         'skimage_out')
+
     # Note that DeviceDirs.GMExpectedDir() is being set up to point at a
     # DIFFERENT directory than self._gm_expected.
     # self._gm_expected : The SVN-managed directory on the buildbot host
@@ -249,6 +274,9 @@ class BuildStep(multiprocessing.Process):
         gm_actual_dir=os.path.join(os.pardir, os.pardir, 'gm', 'actual'),
         gm_expected_dir=os.path.join(os.pardir, os.pardir, 'gm', 'expected'),
         resource_dir=self._resource_dir,
+        skimage_in_dir=self._skimage_in_dir,
+        skimage_expected_dir=self._skimage_expected_dir,
+        skimage_out_dir=self._skimage_out_dir,
         skp_dir=self._local_playback_dirs.PlaybackSkpDir(),
         skp_perf_dir=self._perf_data_dir,
         skp_out_dir=self._local_playback_dirs.PlaybackGmActualDir(),