Run skimage on the bots.

slave/skia_slave_scripts/android_build_step.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.
 
 """ Subclass for all slave-side Android build steps. """
 
 from build_step import BuildStep, DeviceDirs
 from utils import android_utils
 from utils import gs_utils
 from utils import shell_utils
@@ skipping 21 matching lines @@
     """ Read the contents of a file on the device. """
     return android_utils.ADBShell(self._serial, ['cat', filepath, ';', 'echo'],
                                   echo=False)
 
   def _RemoveDirectoryOnDevice(self, directory):
     """ Delete a directory on the device. """
     try:
       android_utils.RunADB(self._serial, ['shell', 'rm', '-r', directory])
     except Exception:
       pass
-    if 'DIRECTORY_EXISTS' in android_utils.ADBShell(self._serial,
-        ['if', '[', '-d', directory, '];', 'then', 'echo', 'DIRECTORY_EXISTS;',
-         'fi']):
+    if self.DevicePathExists(directory):
       raise Exception('Failed to remove %s' % directory)
 
   def _CreateDirectoryOnDevice(self, directory):
     """ Create a directory on the device. """
     android_utils.RunADB(self._serial, ['shell', 'mkdir', '-p', directory])
 
   def PushFileToDevice(self, src, dst):
     """ Overrides build_step.PushFileToDevice() """
     android_utils.RunADB(self._serial, ['push', src, dst])
 
+  def DeviceListDir(self, directory):
+    """ Overrides build_step.DeviceListDir() """
+    return android_utils.ADBShell(self._serial, ['ls', directory],
+                                  echo=False).split('\n')
+
+  def DevicePathExists(self, path):
+    """ Overrides build_step.DevicePathExists() """
+    return 'FILE_EXISTS' in android_utils.ADBShell(
+        self._serial,
+        ['if', '[', '-e', path, '];', 'then', 'echo', 'FILE_EXISTS;', 'fi'])
+
   def DevicePathJoin(self, *args):
     """ Overrides build_step.DevicePathJoin() """
     return posixpath.sep.join(args)
 
   def CreateCleanDirectory(self, directory):
     self._RemoveDirectoryOnDevice(directory)
     self._CreateDirectoryOnDevice(directory)
 
   def CopyDirectoryContentsToDevice(self, host_dir, device_dir):
     """ Copy the contents of a host-side directory to a clean directory on the
@@ skipping 19 matching lines @@
     device_scratch_dir = shell_utils.Bash(
         '%s -s %s shell echo \$EXTERNAL_STORAGE' % (
             android_utils.PATH_TO_ADB, self._serial), 
         echo=True, shell=True).rstrip().split('\n')[-1]
     super(AndroidBuildStep, self).__init__(args=args, **kwargs)
     prefix = posixpath.join(device_scratch_dir, 'skiabot', 'skia_')
     self._device_dirs = DeviceDirs(perf_data_dir=prefix + 'perf',
                                    gm_actual_dir=prefix + 'gm_actual',
                                    gm_expected_dir=prefix + 'gm_expected',
                                    resource_dir=prefix + 'resources',
+                                   skimage_in_dir=prefix + 'skimage_in',
+                                   skimage_expected_dir=(prefix
+                                                         + 'skimage_expected'),
+                                   skimage_out_dir=prefix + 'skimage_out',
                                    skp_dir=prefix + 'skp',
                                    skp_perf_dir=prefix + 'skp_perf',
                                    skp_out_dir=prefix + 'skp_out',
                                    tmp_dir=prefix + 'tmp_dir')